Skip to content

Commit

Permalink
devel/llvm10: fix build with llvm17
Browse files Browse the repository at this point in the history
Fix openmp linker scripts for llvm17.

Use base system libelf and don't link against libffi.

Reformat multi-line OPTION_CMAKE_ON variable.

Co-authored-by:	Dimitry Andric <dim@FreeBSD.org>
Co-authored-by:	Ivan Rozhuk <rozhuk.im@gmail.com>
  • Loading branch information
brooksdavis committed Sep 20, 2023
1 parent 6c6fa97 commit 50e51d2
Show file tree
Hide file tree
Showing 2 changed files with 381 additions and 14 deletions.
37 changes: 23 additions & 14 deletions devel/llvm10/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -111,17 +111,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
Expand All @@ -136,20 +139,26 @@ 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
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}
OPENMP_EXTRA_PATCHES= ${PATCHDIR}/openmp
PYCLANG_DESC= Install python bindings to libclang
Expand Down

0 comments on commit 50e51d2

Please sign in to comment.