git: 4e16eb4b2bf4 - main - devel/llvm17: fix openmp library depends
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Thu, 21 Sep 2023 15:29:29 UTC
The branch main has been updated by brooks:
URL: https://cgit.FreeBSD.org/ports/commit/?id=4e16eb4b2bf4fdd56ce9657203723e7adb4582c3
commit 4e16eb4b2bf4fdd56ce9657203723e7adb4582c3
Author: Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2023-09-21 11:06:18 +0000
Commit: Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2023-09-21 15:23:35 +0000
devel/llvm17: fix openmp library depends
Don't link with libffi.
Reformat long or multi-line OPTION_FOO variables.
PR: 273801
Co-authored-by: Ivan Rozhuk <rozhuk.im@gmail.com>
---
devel/llvm17/Makefile | 41 +++++++++++++++++++++++------------------
1 file changed, 23 insertions(+), 18 deletions(-)
diff --git a/devel/llvm17/Makefile b/devel/llvm17/Makefile
index 73ddc944ca99..8324fe13f3b1 100644
--- a/devel/llvm17/Makefile
+++ b/devel/llvm17/Makefile
@@ -134,8 +134,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|^|%%STATIC_LIBS%%${LLVM_DIR}/lib/libLLVM|} \
- ${_BE_INCS_${BE}:S|^|${LLVM_DIR}/lib/clang/${LLVM_MAJOR}/include/|:N${LLVM_DIR}/lib/clang/${LLVM_MAJOR}/include/$}
+BE_${BE}_PLIST_FILES= \
+ ${_BE_LIBS_${BE}:O:S/$/.a/:S|^|%%STATIC_LIBS%%${LLVM_DIR}/lib/libLLVM|} \
+ ${_BE_INCS_${BE}:S|^|${LLVM_DIR}/lib/clang/${LLVM_MAJOR}/include/|:N${LLVM_DIR}/lib/clang/${LLVM_MAJOR}/include/$}
.endfor
CLANG_DESC= Build clang
CLANG_CMAKE_ON= -DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
@@ -155,14 +156,16 @@ CLANG_USE= PERL5=build
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}
-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
@@ -179,13 +182,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}
@@ -193,9 +197,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 \
- -DLIBOMPTARGET_DEP_LIBFFI_INCLUDE_DIR="" \
- -DLIBOMPTARGET_DEP_LIBFFI_LIBRARIES=""
+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