From nobody Thu Sep 21 15:29:17 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 4RrzpP3WWkz4tZ7X; Thu, 21 Sep 2023 15:29:17 +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 4RrzpP2j2Yz4MBL; Thu, 21 Sep 2023 15:29:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695310157; 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=cKqE0yrLmWUSAVfUJ3p9NjcinN+zKpUpNqE3057rRG0=; b=gaAdeAm2NmdqXqR0a5JrlF3st8+SZf53WGSf3dvXJkXbGIuMA4Lj5aCgwV+awOoEGPnh7R uE2cmQpcqeiIjfyHmjQ+7FL7PYTWAsy29HmwUJ4ExQ+x2o3aeEuMrWyxexq/Iy6BteQJJw EXs+vHRB4puAGyzKI7FXmir16ZoWLc8QB0T8G+s+l0W2DcIwLn2tOz7rga8SvUaQMjHoGX MH5eHi533zP1mDYxgBtcIKV+dUa5SDuJKZEcDT9uy/vy9/Z82KSxmpwHaSF8GvRNdlxWRX WSzBR+0hkBIvKRy/JZSvy1EKC4DSHWxHhdutazx+AOZJWdd6JudQpzwRIRCdSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695310157; a=rsa-sha256; cv=none; b=BVM+m1NR/hcfN/3Nv/t2u+C9+0oNC77C8Npmbn60R4GYwlrW5c2u8ouhdbB0N76ZDjXAhz PpZhmOo0CzPA4mcsTZ5BtyMPAYdUl4/q1J7XiIWDck6evOm9J27S8BYj6GZFGJ4WT8y2OI FMSLVPyF9OPFjYgXA9OefDCNwF8ZnYkgdM9ZpOn2w3MCQ8MQ77xpj5s6zv66ZG43/P6OAu hkfoiagaNS3DCDqcbLKAJeeMglAfJuK5jYWWfLHuUKAyEp+1N7Ju1uPR10JwYNLtn+8m0a c8yaQL7uQlKWFc1mH0pKb9jQ1lq1zQukCVMYUX8w9+PaGeB0shgKkUTR4hN80A== 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=1695310157; 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=cKqE0yrLmWUSAVfUJ3p9NjcinN+zKpUpNqE3057rRG0=; b=PiiWRE3i1y/i5OOcAdMMvT8McUa44wKMSibsiP+DdndlKa8DBM40uZE3dxj7HZKixSPxCA EcnT6/U1d+6vLAp0O8+ZQKAqyLbEcf5diDvxK9pyqK+mPHgmez7l4aQgyGw2DwryXE/coa ulptriJUXoHLjBHWJq8HmOYXH29qXYGzTNL13F04U+3ke/gCFkIg9LwUtUlcoWiFS8JVXI fhcu9GqmYyJEIgybFUS2xRmaUZS4xlvoc/k9Hl4QrHUQPNGcCv1xQ4r/oQ9qmolgnV4W/Y VT76m1yzOzxQyHwmaM8Q+lk7coGsS9r9qklRgKjeAHLrAh33cL+MopDBxyBXtQ== 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 4RrzpP1Tb4zkdY; Thu, 21 Sep 2023 15:29:17 +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 38LFTH9h090191; Thu, 21 Sep 2023 15:29:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LFTHM9090188; Thu, 21 Sep 2023 15:29:17 GMT (envelope-from git) Date: Thu, 21 Sep 2023 15:29:17 GMT Message-Id: <202309211529.38LFTHM9090188@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: 784b096f01e8 - main - devel/llvm11: 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: 784b096f01e8c65c3f5aaddadc4b9ed231354c76 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=784b096f01e8c65c3f5aaddadc4b9ed231354c76 commit 784b096f01e8c65c3f5aaddadc4b9ed231354c76 Author: Brooks Davis AuthorDate: 2023-09-21 08:38:46 +0000 Commit: Brooks Davis CommitDate: 2023-09-21 15:23:31 +0000 devel/llvm11: 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/llvm11/Makefile | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/devel/llvm11/Makefile b/devel/llvm11/Makefile index bf81ca24124c..344ccde0df79 100644 --- a/devel/llvm11/Makefile +++ b/devel/llvm11/Makefile @@ -1,6 +1,6 @@ PORTNAME= llvm DISTVERSION= 11.0.1 -PORTREVISION= 7 +PORTREVISION= 8 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} @@ -107,17 +107,20 @@ CLANG_USE= GNOME=libxml2 COMPILER_RT_DESC= Sanitizer libraries COMPILER_RT_DISTFILES= compiler-rt-${DISTVERSION}.src${EXTRACT_SUFX} COMPILER_RT_EXTRA_PATCHES= ${PATCHDIR}/compiler-rt -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_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_EXTRA_PATCHES= ${PATCHDIR}/extras @@ -132,13 +135,14 @@ LLD_DESC= Install lld, the LLVM linker LLD_DISTFILES= lld-${DISTVERSION}.src${EXTRACT_SUFX} LLDB_BINARY_ALIAS= swig=swig40 LLDB_BUILD_DEPENDS= swig40:devel/swig40 -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_DISTFILES= lldb-${DISTVERSION}.src${EXTRACT_SUFX} LLDB_EXTRA_PATCHES= ${PATCHDIR}/lldb @@ -146,6 +150,11 @@ LLDB_IMPLIES= CLANG LLDB_PORTDOCS= lldb 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_DISTFILES= openmp-${DISTVERSION}.src${EXTRACT_SUFX} PYCLANG_DESC= Install python bindings to libclang PYCLANG_IMPLIES= CLANG