From nobody Thu Sep 21 15:29:19 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 4RrzpR5y4Dz4tZPG; Thu, 21 Sep 2023 15:29:19 +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 4RrzpR4m6Fz4MH8; Thu, 21 Sep 2023 15:29:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695310159; 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=Zq1ZguJ9+ycBOUhHyXEYY8ucphdtnLjCAO+M/puhbOo=; b=WiR90+odvLFJCIfePJYagXdQCuJJ4SR0UYgDHM3clS5D7rA5OREdc1iUDEMvYQ/p2ezmOC +4YEIWLcNheTlNwoAzw8lq0z0V1EfFpaE21NXqm7vS2Cuvv79vCQJa8rv3tyKGAF1n4hxo niw2qsw0nahNSdRxnYpl4SCgiHjvaihdtf3em8u6hx2flu2R7OgAVjd0BzxOU43Hb/myel gMu3HQi0vR8rsdv4uoBig1GOs92zENolyELsvgMcXEJh0d30+H9VQ5GKp/nA/2f/wARBmC 78Dtxy2V3SfN4B/3nBiXJUuUAttCn+L4lvD8hA3RxkgvwFS2U0yvzrWBmzAU7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695310159; a=rsa-sha256; cv=none; b=cS8Bkk1IzVi6v2DJ79OODEL7ztHE5G8yu0XsPf8GsIpzxUw+cBOe+rfyRlONkGNu77h+4C 3yePqYneERCyu1/sUg5kLpCTe/2dVQBLSc9VDfKHm+WxTgMuFatAt7BbF6tVBi0AJH+1NE hBj7dWRAqMkG9a1WJgtlNGOSSIORSs1MIDV4F1zIMy6aFdenCZNx3bwYdaeNS9WbIH9Z6G 1xcEFh7Iprj/vyTMSaS08l9nfZ28E8DACtugHi04RH5nD7Plg7YyvKHYvNUPB1znDlBCwx 8LSCQesN1U4LeEYIw01rQ59Fwv1bp8yb/M3tBG7ezRzQcN1gEG+opFlxqx2HNg== 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=1695310159; 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=Zq1ZguJ9+ycBOUhHyXEYY8ucphdtnLjCAO+M/puhbOo=; b=BbhFmN6XjbO1pu23zQhzlyBLGaJCXRa7levvddR7KUKoelBm0WBdkXZ/zN/konFAh3IgHd KKpzDsEmBJR8yUaXhRHgfTONcyofWRWGdcLzzwyq+5iD4HKQGn1LbkqyeHg8FbMOBfWk41 3RZGtE3Ju0g/zz/PJhlsgPodeFqJP9xlyh+8JHfBL/xpddSoA8RLnJttP+G6AefIaj0vUg Dcj0KF7Z64ROjCw1YXTUoitNtaTFFy9LjJklr5k82iSD36fVgtrbM1epLGIMWkmupJx2ta 96kLdxgVGma+jLSCAI7+TeJ9vH4sJMLAPpYG492mSmpzgZvq3ypLLrTHUsaG0w== 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 4RrzpR37b4zkLf; Thu, 21 Sep 2023 15:29:19 +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 38LFTJWW090285; Thu, 21 Sep 2023 15:29:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LFTJp6090282; Thu, 21 Sep 2023 15:29:19 GMT (envelope-from git) Date: Thu, 21 Sep 2023 15:29:19 GMT Message-Id: <202309211529.38LFTJp6090282@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: 61ee2ce26f02 - main - devel/llvm12: 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: 61ee2ce26f020481d3975d1f75796ae1a37beab8 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=61ee2ce26f020481d3975d1f75796ae1a37beab8 commit 61ee2ce26f020481d3975d1f75796ae1a37beab8 Author: Brooks Davis AuthorDate: 2023-09-21 15:20:28 +0000 Commit: Brooks Davis CommitDate: 2023-09-21 15:23:31 +0000 devel/llvm12: 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/llvm12/Makefile | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/devel/llvm12/Makefile b/devel/llvm12/Makefile index ec426eacc4c2..ffab8372d11e 100644 --- a/devel/llvm12/Makefile +++ b/devel/llvm12/Makefile @@ -1,6 +1,6 @@ PORTNAME= llvm DISTVERSION= 12.0.1 -PORTREVISION= 10 +PORTREVISION= 11 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} @@ -120,19 +120,22 @@ COMPILER_RT_DESC= Sanitizer libraries # An unwind.h is require to build. I think an in-tree one should be used # but this seems to work as a workaround... COMPILER_RT_BUILD_DEPENDS= libunwind>0:devel/libunwind -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} # Allow unwind.h to be found reliably COMPILER_RT_USES= localbase COMPILER_RT_PLIST_FILES=${_COMPILER_RT_LIBS:S|^|${_CRTLIBDIR}/|} \ ${_COMPILER_RT_BLACKLISTS:S|^|${_CRTBLDIR}/|} -DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}recommonmark>=0.0.20180530:textproc/py-recommonmark@${PY_FLAVOR} +DOCS_BUILD_DEPENDS= \ + ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${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 @@ -143,18 +146,24 @@ 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_USES= lua:53 libedit LLDB_VARS= _USES_PYTHON=python OPENMP_DESC= Install libomp, the LLVM OpenMP runtime library +OPENMP_CMAKE_ON= \ + -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