From nobody Thu Sep 21 15:29:26 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RrzpZ74JPz4tZM8; Thu, 21 Sep 2023 15:29:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RrzpZ2zZ0z4MjK; Thu, 21 Sep 2023 15:29:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695310166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2O8ArSD20GQorUR5MI/mjcIkDfsLuDHiLuaDzuM7ANk=; b=CgBDncUuMpXxBXztcrHC/Qc0M+YDzbFw0COAIZxuHhBZLVoasAPqzKSvWz0jZGxRnSqoHJ +zTWJqXHXxBdJfqq5+RZNhBRjJ8IdalXbqAWK1ysSfnKd6e7R5cvzc312B57+pmRaEbX7m /IeLlSkPwsOHyclFPxmLPRKjyviKdt4DmJm3r5tjpD8uFurP90KNd0rVoq9JMl3QuVk8Fg pj0vOcA9fjo/8jsCYRo01egtROTk6x8KqIpZrYZ3sB/QPYCpvebyLRg1sLlAaSV/gLD+kq Z7wHfQvOPDa0Kcbq+BSMSmnUFf7n3/z30kf64PcYyZpqPjFS3pripPiCq7QM+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695310166; a=rsa-sha256; cv=none; b=HTZ6T0tmkHKgYHYWyJAI4LPFyYQgeN1b/X5qAW81Ku0v6LcBMBwabuS/gH6TvyeEo/FAUT hvWKcUgbiW+xZr+44gqhPOJTBnFnlrxIsdgQL1UU2Pi7RJmtLGtwumIf6VAVottcJxN0mb chzTn533N97y9jSWqokMJDmyjnUuEDNwr0m05XZsYvf6AXucrjCS97TwgqvMzh0d6QLB1H 8rHUdMt4Qk4zZ+vMJgrwuH4od/lBtNnrz8wN7rp9wGPsVnh6DGyNmetvztprBt7+Xoqf3w R0pUcj7KZ26Wy7qWSvMJTVB+cfZGpt6dnvO6oa8QHPsf5mtEcFuVqdocVB1opg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695310166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2O8ArSD20GQorUR5MI/mjcIkDfsLuDHiLuaDzuM7ANk=; b=aULQ79RHWIEJv57WYbUdNyLcIVaVQtCwmKVpImz35ZsjsOUwyD2+jg0JaeyDRtFsSphRdA kkq/BGGFpsi6jOXq3ji7FjmeS4yX6nWvxZ4Wo8HF51DFATFAlqwW2eKhjDDy8EZV8FmV+r Sr/iEaLVfiaZkCzBcP7Nuy1OY9yPmL2heTbY4XFEjFF4vsCDpj63I+pJwBmeC6C18C6tR+ eEkkqYiKut+PDrOddyMQJDDlz0vPFa+i9dTPcVlfqRaev83q44y4p/QrHHJk8gnPGT7g2W dgZfsFaGHbkmjuEjdb+ncolGfpdbha6bnTj3CagKtk+phy6ShvCR8fR6NKXO8Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RrzpZ252yzjmB; Thu, 21 Sep 2023 15:29:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38LFTQ13090556; Thu, 21 Sep 2023 15:29:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LFTQd4090553; Thu, 21 Sep 2023 15:29:26 GMT (envelope-from git) Date: Thu, 21 Sep 2023 15:29:26 GMT Message-Id: <202309211529.38LFTQd4090553@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Brooks Davis Subject: git: e75f65a524d6 - main - devel/llvm15: fix openmp library depends List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e75f65a524d6df56ebebb57fa9cff6ad23ba2593 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=e75f65a524d6df56ebebb57fa9cff6ad23ba2593 commit e75f65a524d6df56ebebb57fa9cff6ad23ba2593 Author: Brooks Davis AuthorDate: 2023-09-21 10:38:30 +0000 Commit: Brooks Davis CommitDate: 2023-09-21 15:23:33 +0000 devel/llvm15: fix openmp library depends Use base system libelf and don't link with libffi. Reformat multi-line OPTION_CMAKE_ON variables. PR: 273801 Co-authored-by: Ivan Rozhuk --- devel/llvm15/Makefile | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/devel/llvm15/Makefile b/devel/llvm15/Makefile index ef43132df0eb..b6e0f0880057 100644 --- a/devel/llvm15/Makefile +++ b/devel/llvm15/Makefile @@ -1,6 +1,6 @@ PORTNAME= llvm DISTVERSION= 15.0.7 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel lang MASTER_SITES= https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \ https://${PRE_}releases.llvm.org/${LLVM_RELEASE}${RCDIR}/ @@ -151,17 +151,19 @@ CLANG_SUB_LIST= XCC=clang${LLVM_SUFFIX} \ CLANG_USE= PERL5=build .endif COMPILER_RT_DESC= Sanitizer libraries -COMPILER_RT_CMAKE_ON= -DCOMPILER_RT_INSTALL_PATH=${LLVM_PREFIX}/lib/clang/${LLVM_RELEASE} +COMPILER_RT_CMAKE_ON= \ + -DCOMPILER_RT_INSTALL_PATH=${LLVM_PREFIX}/lib/clang/${LLVM_RELEASE} COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \ ${_COMPILER_RT_IGNORELISTS:S|^|${_CRTBLDIR}/|} DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx-markdown-tables>=0:textproc/py-sphinx-markdown-tables@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR} DOCS_CONFLICTS_BUILD= cmark DOCS_PORTDOCS= llvm -DOCS_CMAKE_ON= -DLLVM_ENABLE_SPHINX=ON \ - -DSPHINX_EXECUTABLE=${LOCALBASE}/bin/sphinx-build-${PYTHON_VER} \ - -DSPHINX_WARNINGS_AS_ERRORS=OFF \ - -DLLVM_BUILD_DOCS=ON +DOCS_CMAKE_ON= \ + -DLLVM_ENABLE_SPHINX=ON \ + -DSPHINX_EXECUTABLE=${LOCALBASE}/bin/sphinx-build-${PYTHON_VER} \ + -DSPHINX_WARNINGS_AS_ERRORS=OFF \ + -DLLVM_BUILD_DOCS=ON DOCS_PLIST_FILES= ${MAN1SRCS:S|^|man/man1/|:S|.1$|${LLVM_SUFFIX}.1.gz|} EXTRAS_DESC= Extra clang tools EXTRAS_IMPLIES= CLANG @@ -177,13 +179,14 @@ LIT_DESC= Install lit and FileCheck test tools LIT_VARS= _USES_PYTHON=python LLD_DESC= Install lld, the LLVM linker LLDB_BUILD_DEPENDS= swig:devel/swig -LLDB_CMAKE_ON= -DLUA_INCLUDE_DIR=${LOCALBASE}/include/lua${LUA_VER_STR} \ - -DLUA_LIBRARY=${LOCALBASE}/lib/liblua-${LUA_VER}.so \ - -DCURSES_INCLUDE_PATH=/usr/include \ - -DCURSES_CURSES_LIBRARY=/usr/lib/libcurses.so \ - -DCURSES_FORM_LIBRARY=/usr/lib/libform.so \ - -DCURSES_NCURSES_LIBRARY=/usr/lib/libncurses.so \ - -DPANEL_LIBRARIES=/usr/lib/libpanel.so +LLDB_CMAKE_ON= \ + -DLUA_INCLUDE_DIR=${LOCALBASE}/include/lua${LUA_VER_STR} \ + -DLUA_LIBRARY=${LOCALBASE}/lib/liblua-${LUA_VER}.so \ + -DCURSES_INCLUDE_PATH=/usr/include \ + -DCURSES_CURSES_LIBRARY=/usr/lib/libcurses.so \ + -DCURSES_FORM_LIBRARY=/usr/lib/libform.so \ + -DCURSES_NCURSES_LIBRARY=/usr/lib/libncurses.so \ + -DPANEL_LIBRARIES=/usr/lib/libpanel.so LLDB_DESC= Install lldb, the LLVM debugger LLDB_IMPLIES= CLANG LLDB_PLIST_SUB= PYTHON_ABIVER=${PYTHON_ABIVER} @@ -191,7 +194,12 @@ LLDB_USES= lua:53 libedit LLDB_VARS= _USES_PYTHON=python MLIR_DESC= Multi-Level Intermediate Representation OPENMP_DESC= Install libomp, the LLVM OpenMP runtime library -OPENMP_CMAKE_ON= -DLIBOMPTARGET_BUILD_DEVICERTL_BCLIB=OFF +OPENMP_CMAKE_ON= \ + -DLIBOMPTARGET_BUILD_DEVICERTL_BCLIB=OFF \ + -DLIBOMPTARGET_DEP_LIBELF_INCLUDE_DIR="/usr/include/libelf.h" \ + -DLIBOMPTARGET_DEP_LIBELF_LIBRARIES="/usr/lib/libelf.so" \ + -DLIBOMPTARGET_DEP_LIBFFI_INCLUDE_DIR="" \ + -DLIBOMPTARGET_DEP_LIBFFI_LIBRARIES="" OPENMP_PORTDOCS= openmp PYCLANG_DESC= Install python bindings to libclang PYCLANG_IMPLIES= CLANG