From nobody Thu Sep 21 15:29:28 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 4Rrzpd08HQz4tZKP; Thu, 21 Sep 2023 15:29:29 +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 4Rrzpc5Xf8z4MmL; Thu, 21 Sep 2023 15:29:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695310168; 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=gKcP+jbD+fecle6r3w9BJOY2lbaElNGdRPV2pOypcwc=; b=d3/AE7NcVvaH/D+t2mnj5JbgB3ipXrjR0Ve9Qaava8uT/tz0GZdsZmninQZi2SK+BJI1UN Da8+IYKzdPHgVR11j6ROjw256Y/VdmLJUms2MmSJ+6r6Y17LUKmnIm3pMW1QK5e3uu8wYI xdLxam0Y/nwXoJSpXjCZH3IDEBA6G0Tz7IcJuS6SpiTbjnmC6JqDaZ8Ry7wu/OA0p5yLG2 Bx3ivY+gdFEWG29I55Cx1YzWSMAUSUlpG50Ud+a96d9W4W5DCCz7cJYlkyRxUJMbfYBc3e 6MaGVtNvVcpM8/AeB8+LnxzoLXqtvWueD/zSEPIn5NNL/eWzeMf6pRp0PGTDjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695310168; a=rsa-sha256; cv=none; b=Yi/8BnSzoe6ixSLS1e7uuDelgggWGlKtohQl4qv3bWxN7S+TQP9NxpNEe+jrlwwzTplFhE PlZVJEqqKurMH6bID4tnfAZOMBHAnFLrSmZkjMhxCAyzjGuZrK70Kf7lH1C8Teh+9NRdac U199BhZXPJiFFtHAj2REFGPITJR5TlyGpQjvJtWCG+2oSiLhQ9/nytBYSuApOkU1dA3moZ 1mgoSS5B7H1FNqS+YoqZUNVkIUFDZkxqo1godjpqcJDB4OV1nW/8nLecKYSuoNJufMEdMe 3Z+/2CES5k3IsZAfho+OlL5RWdAL5PVTSXeT+tT/6FiGDxL4iiJnObzne6hnPg== 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=1695310168; 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=gKcP+jbD+fecle6r3w9BJOY2lbaElNGdRPV2pOypcwc=; b=GufDwGLPDvCD6yEdSVQE0wOt2uk2NbB0I4nDDfghy9BmtIVKltYKpmlVKk8/ny05kORJmZ ifNO1eg0qRrDRKCOvrqtpw+qKfSI0fBMr9CbWDys2eSsJj8RFVr8iOONDEOWXzbq3k7hlg QotfZ0vuH6xKMjso20s2EjFlVgz61VVIhsRjtJcpEOPUJW6qvvKjxH3fpf7TuOrw6LtuL2 nSKM97CQBYFhpydQy4sHKLarV158efRXDf4tYATl05T4JVh9+ftZjpEVTfGykyyfq8gk85 pcvnMYZ6fU+GH6s0ygWfTHVG4Hi+hUTmNdscA3++45MePP9GDfnREnzYpggz0A== 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 4Rrzpc4DclzkX1; Thu, 21 Sep 2023 15:29:28 +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 38LFTSnW090647; Thu, 21 Sep 2023 15:29:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38LFTS7K090644; Thu, 21 Sep 2023 15:29:28 GMT (envelope-from git) Date: Thu, 21 Sep 2023 15:29:28 GMT Message-Id: <202309211529.38LFTS7K090644@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: efe81450e1c4 - main - devel/llvm16: 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: efe81450e1c4e4b029e104cf0bc49a80625c481a Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=efe81450e1c4e4b029e104cf0bc49a80625c481a commit efe81450e1c4e4b029e104cf0bc49a80625c481a Author: Brooks Davis AuthorDate: 2023-09-21 10:45:11 +0000 Commit: Brooks Davis CommitDate: 2023-09-21 15:23:34 +0000 devel/llvm16: fix openmp library depends Don't link with libffi. Reformat long and/or multi-line OPTION_FOO variables. PR: 273801 Co-authored-by: Ivan Rozhuk --- devel/llvm16/Makefile | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/devel/llvm16/Makefile b/devel/llvm16/Makefile index 14d05a075b54..77288c9bc607 100644 --- a/devel/llvm16/Makefile +++ b/devel/llvm16/Makefile @@ -1,6 +1,6 @@ PORTNAME= llvm DISTVERSION= 16.0.6 -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}/ @@ -152,16 +152,19 @@ CLANG_USES= perl5 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} -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 @@ -178,13 +181,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} @@ -192,7 +196,10 @@ 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_LIBFFI_INCLUDE_DIR="" \ + -DLIBOMPTARGET_DEP_LIBFFI_LIBRARIES="" OPENMP_PORTDOCS= openmp PYCLANG_DESC= Install python bindings to libclang PYCLANG_IMPLIES= CLANG