From nobody Thu Sep 21 15:29:23 2023 X-Original-To: dev-commits-ports-all@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 4RrzpX1c5Wz4tZFB; Thu, 21 Sep 2023 15:29:24 +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 4RrzpX15Wtz4MfP; Thu, 21 Sep 2023 15:29:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695310164; 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=DZCyD/dI2lQzqyNy4/zVceyp7yx/E4hSgsrtl8buT6k=; b=RgeQYIZNO9+MGvI7xEMoNuU4t/hJtbWnhIrLf+AkWM6p5rVnRZ61Miy1+jOiTwTVLil41w rBDtxJ+u1S+Ju0i93Oci6yyUa/lEBzkN0zUgwmF4bU5xDDvl2Ru++GjpGRLLOv7pOiLiY5 L2Jh4qt4YaOslszOlWGpp9om+olDefH/MqAlKSNeNyMFVVn6augEdWRxiq1jc6jb8f1Ieq /jOL3eYPKY194BWMliEKWdL4Sk9IZpGJ4TFr+TeWEIyoi0wGA/WVvrU6j1nETWV457rsqO U4SgZWtXh7WJRjEtdLySuFHK/ojyPD+sM2m7RA6bFLSBrxEdAJkLWs/JT2pNIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695310164; a=rsa-sha256; cv=none; b=fG6VA17P5BTpMIq0IEWeN+q7iNhqgNjsWlCNSlVj3lcxnuS113v8jpThXVJqEsHBKBZbkR EJwl5jSx/ij4Bit8Nwn+rw8VbkqucP+wAPEyLn4IOwi+9SY4IgAZtmwB83lZ80D9g4RlbZ D+LICpcVc2ZrAG5BcVzh0oCqlExeX8WffqWiO7XJOSu+xvEguum4Aix8AvXkJDOZDXqj1n hlWS0AmHnxPm9oJlo/FY6kslKXgjqe7tfBtHfhK0poBxdd3gbeDvE69hLhZ/bJG58lQtDk aEBX0Oxv+PE7nN+1MedvP6ZuY/wZLIAzqetylPPm5upEFZgJncuO6aQvubrT4w== 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=1695310164; 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=DZCyD/dI2lQzqyNy4/zVceyp7yx/E4hSgsrtl8buT6k=; b=dibQNCaf/PL44cAdycMxhyR7cogxIQ2tWNDe1EeWWxBVLSTzJQ2dYuQLh9Tc9zzuMhzh/y OQb1XRd/J/8H8IGEe1nv1ECWW1S4JzW4y5Gz5e4/lki7ZLL9p2zjvEN2X6gKNZRkoCzc/r i3p5ekwmnZP6HNn2bzLoegXcDqj3vafd25Lrfl0df5pP3eVv/jPnqfsOXfC0o4WuY1nghX GAHQM3hKwM4LpwAWA1sP0rRf7Em9TxoIMVnLkhMaFk4y7h1OTNVpdd/rljOnnPkGaj0x+E 2Ft8ANNA0nZJee/SmjXVJGfMgGS7L+AgUPhq5rsd5CKTo36I+aklmGKenrxRgQ== 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 4RrzpX09dMzkdZ; Thu, 21 Sep 2023 15:29:24 +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 38LFTNgi090463; Thu, 21 Sep 2023 15:29:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LFTNt9090460; Thu, 21 Sep 2023 15:29:23 GMT (envelope-from git) Date: Thu, 21 Sep 2023 15:29:23 GMT Message-Id: <202309211529.38LFTNt9090460@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: c1fe5e63cc15 - main - devel/llvm14: fix openmp library depends List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: c1fe5e63cc150ab1dab75d61fa7f3454d1dc321c Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=c1fe5e63cc150ab1dab75d61fa7f3454d1dc321c commit c1fe5e63cc150ab1dab75d61fa7f3454d1dc321c Author: Brooks Davis AuthorDate: 2023-09-21 10:33:50 +0000 Commit: Brooks Davis CommitDate: 2023-09-21 15:23:33 +0000 devel/llvm14: fix openmp library depends Use base system libelf and don't link with libffi. Reformat long and/or multi-line OPTION_FOO variables. PR: 273801 Co-authored-by: Ivan Rozhuk --- devel/llvm14/Makefile | 45 +++++++++++++++++++++++++++------------------ 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/devel/llvm14/Makefile b/devel/llvm14/Makefile index 4feceed85d71..dd1e036bb435 100644 --- a/devel/llvm14/Makefile +++ b/devel/llvm14/Makefile @@ -1,6 +1,6 @@ PORTNAME= llvm DISTVERSION= 14.0.6 -PORTREVISION= 1 +PORTREVISION= 2 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} @@ -117,8 +117,9 @@ BE_NATIVE_CMAKE_ON= -DLLVM_TARGETS_TO_BUILD="${NATIVE_BACKENDS:ts;}" BE_STANDARD_DESC= All non-experimental backends BE_WASM_DESC= WebAssembly backend (required by firefox via wasi) .for BE in FREEBSD NATIVE STANDARD -BE_${BE}_PLIST_FILES= ${_BE_LIBS_${BE}:O:S/$/.a/:S|^|${LLVM_DIR}/lib/libLLVM|} \ - ${_BE_INCS_${BE}:S|^|${LLVM_DIR}/lib/clang/${LLVM_RELEASE}/include/|:N${LLVM_DIR}/lib/clang/${LLVM_RELEASE}/include/$} +BE_${BE}_PLIST_FILES= \ + ${_BE_LIBS_${BE}:O:S/$/.a/:S|^|${LLVM_DIR}/lib/libLLVM|} \ + ${_BE_INCS_${BE}:S|^|${LLVM_DIR}/lib/clang/${LLVM_RELEASE}/include/|:N${LLVM_DIR}/lib/clang/${LLVM_RELEASE}/include/$} .endfor CLANG_DESC= Build clang CLANG_CMAKE_ON= -DCLANG_DEFAULT_OPENMP_RUNTIME=libomp @@ -135,14 +136,16 @@ COMPILER_RT_DESC= Sanitizer libraries 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_BLACKLISTS: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_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 @@ -158,13 +161,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} @@ -172,8 +176,13 @@ 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_AMDGCN_BCLIB=OFF \ - -DLIBOMPTARGET_BUILD_DEVICERTL_BCLIB=OFF +OPENMP_CMAKE_ON= \ + -DLIBOMPTARGET_BUILD_AMDGCN_BCLIB=OFF \ + -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