Date: Tue, 11 Jan 2022 17:12:50 GMT From: Brooks Davis <brooks@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: bbe2fcc4d671 - main - devel/llvm-devel: fix i386 builds, minor improvements Message-ID: <202201111712.20BHCoJ6019635@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=bbe2fcc4d6715ada89d47b132a383e06faee80c0 commit bbe2fcc4d6715ada89d47b132a383e06faee80c0 Author: Brooks Davis <brooks@FreeBSD.org> AuthorDate: 2022-01-11 17:06:23 +0000 Commit: Brooks Davis <brooks@FreeBSD.org> CommitDate: 2022-01-11 17:12:07 +0000 devel/llvm-devel: fix i386 builds, minor improvements Fix OpenMP build on i386 by removing a bogus assert. The assert was added in https://reviews.llvm.org/D114270 and is wrong on 32-bit. It's a little unclear if this will work of if we should disable the AMDGPU plugin on i386. Remove some conflicts for long-removed packages (clang-devel and iomp5-devel). Don't hardcode PYTHON_EXT_SUFFIX in the plist. [0] PR: 261034 [0] Reported by: Trond.Endrestol@ximalas.info [0] --- devel/llvm-devel/Makefile | 3 +-- .../patch-openmp_libomptarget_plugins_amdgpu_impl_internal.h | 10 ++++++++++ devel/llvm-devel/pkg-plist | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/devel/llvm-devel/Makefile b/devel/llvm-devel/Makefile index 11d150e3c9ef..94a8f79d9932 100644 --- a/devel/llvm-devel/Makefile +++ b/devel/llvm-devel/Makefile @@ -114,7 +114,6 @@ PLIST_FILES= PLIST_SUB_SED_EXCLUDE_VAL= lib "3.0.0" CLANG_DESC= Build clang -CLANG_CONFLICTS_INSTALL= clang-devel CLANG_CMAKE_ON= -DCLANG_DEFAULT_OPENMP_RUNTIME=libomp \ -DCLANG_LINK_LLVM_DYLIB=ON CLANG_PORTDOCS= clang @@ -165,7 +164,6 @@ LLDB_VARS= _USES_PYTHON=python:3.6+ MLIR_DESC= Multi-Level Intermediate Representation OPENMP_DESC= Install libomp, the LLVM OpenMP runtime library OPENMP_PORTDOCS= openmp -OPENMP_CONFLICTS_INSTALL= libiomp5-devel OPENMP_USES= perl5 OPENMP_USE= PERL5=build STATIC_LIBS_DESC= Install static libraries (does not effect sanitizers) @@ -541,6 +539,7 @@ build-plist: ${GREP} -v '[/-]lit$$' | ${GREP} -v 'FileCheck$$' | \ ${GREP} -v man/man1 | ${SED} -e 's|${STAGEDIR}${PREFIX}/||' \ -e 's|${PYTHON_SITELIBDIR:C|${PREFIX}/||}|%%PYTHON_SITELIBDIR%%|' \ + -e 's|${PYTHON_EXT_SUFFIX:C/\./\\./g}|%%PYTHON_EXT_SUFFIX%%|' \ -e 's|${PORTVERSION}|%%PORTVERSION%%|' \ -e 's|release.cmake|%%CMAKE_BUILD_TYPE%%.cmake|' \ -e 's|${LLVM_RELEASE:C/\./\\./g}|%%LLVM_RELEASE%%|' \ diff --git a/devel/llvm-devel/files/patch-openmp_libomptarget_plugins_amdgpu_impl_internal.h b/devel/llvm-devel/files/patch-openmp_libomptarget_plugins_amdgpu_impl_internal.h new file mode 100644 index 000000000000..8b745c18d5a5 --- /dev/null +++ b/devel/llvm-devel/files/patch-openmp_libomptarget_plugins_amdgpu_impl_internal.h @@ -0,0 +1,10 @@ +--- openmp/libomptarget/plugins/amdgpu/impl/internal.h.orig ++++ openmp/libomptarget/plugins/amdgpu/impl/internal.h +@@ -42,7 +42,6 @@ + unsigned long unused1; + unsigned long unused2; + } impl_implicit_args_t; +-static_assert(sizeof(impl_implicit_args_t) == 56, ""); + + // ---------------------- Kernel Start ------------- + typedef struct atl_kernel_info_s { diff --git a/devel/llvm-devel/pkg-plist b/devel/llvm-devel/pkg-plist index d6e19a8028ea..dba982fe7475 100644 --- a/devel/llvm-devel/pkg-plist +++ b/devel/llvm-devel/pkg-plist @@ -126,7 +126,7 @@ bin/split-file-devel %%LIT%%bin/llvm-lit-devel %%LIT%%llvm-devel/bin/llvm-lit %%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/__init__.py -%%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/_lldb.cpython-38.so +%%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/_lldb%%PYTHON_EXT_SUFFIX%%.so %%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/embedded_interpreter.py %%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/formatters/Logger.py %%LLDB%%llvm-devel/%%PYTHON_SITELIBDIR%%/lldb/formatters/__init__.py
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202201111712.20BHCoJ6019635>