New comment by Johnnynator on void-packages repository https://github.com/void-linux/void-packages/pull/40821#issuecomment-1382939956 Comment: I did some fixes for cross, also I don't think we need the per target runtime dirs, and if we did use them you should probably use a wildcard in vinstall ```diff diff --git a/srcpkgs/llvm15/template b/srcpkgs/llvm15/template index db510bbd24..6249ec307c 100644 --- a/srcpkgs/llvm15/template +++ b/srcpkgs/llvm15/template @@ -4,6 +4,7 @@ version=15.0.6 revision=1 build_wrksrc=llvm build_style=cmake +_ext_suffix=".cpython-${py3_ver/./}-linux-${XBPS_TARGET_LIBC/glibc/gnu}.so" configure_args=" -DCMAKE_BUILD_TYPE=Release -Wno-dev -DENABLE_LINKER_BUILD_ID=YES @@ -23,11 +24,15 @@ configure_args=" -DLLVM_LINK_LLVM_DYLIB=YES -DLLVM_ENABLE_RTTI=YES -DLLVM_ENABLE_FFI=YES - -DLLVM_BINUTILS_INCDIR=/usr/include" + -DLLVM_BINUTILS_INCDIR=/usr/include + -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=NO + -DLLDB_PYTHON_RELATIVE_PATH=lib/python${py3_ver}/site-packages + -DLLDB_PYTHON_EXE_RELATIVE_PATH=bin/python${py3_ver} + -DLLDB_PYTHON_EXT_SUFFIX=$_ext_suffix" hostmakedepends="perl python3 zlib-devel libffi-devel swig python3-Sphinx python3-recommonmark python3-sphinx-automodapi" makedepends="python3-devel zlib-devel elfutils-devel libffi-devel libedit-devel libxml2-devel binutils-devel libatomic-devel" depends="libllvm15>=${version}_${revision}" short_desc="Low Level Virtual Machine" maintainer="Orphaned " @@ -56,7 +61,7 @@ _libomp_enable=no case "$XBPS_TARGET_MACHINE" in ppc64le*) ;; - ppc*|i686*) _lldb_enable=no ;; + ppc*|i686*|riscv64*) _lldb_enable=no ;; esac case "$XBPS_TARGET_MACHINE" in @@ -153,9 +158,14 @@ pre_configure() { -DLLVM_ENABLE_PROJECTS=${_enabled_projects} make ${makejobs} -C utils/TableGen make ${makejobs} -C tools/clang/utils/TableGen + make ${makejobs} -C tools/clang/tools/extra/clang-tidy/misc/ConfusableTable + make ${makejobs} -C tools/clang/tools/extra/pseudo/gen [ "$_lldb_enable" = "yes" ] && make ${makejobs} -C tools/lldb/utils/TableGen configure_args+=" -DLLVM_TABLEGEN=${wrksrc}/llvm/build/HOST/bin/llvm-tblgen" configure_args+=" -DCLANG_TABLEGEN=${wrksrc}/llvm/build/HOST/bin/clang-tblgen" + configure_args+=" -DCLANG_TIDY_CONFUSABLE_CHARS_GEN=${wrksrc}/llvm/build/HOST/bin/clang-tidy-confusable-chars-gen" + configure_args+=" -DCLANG_PSEUDO_GEN=${wrksrc}/llvm/build/HOST/bin/clang-pseudo-gen" + [ "$_lldb_enable" = "yes" ] && configure_args+=" -DLLDB_TABLEGEN=${wrksrc}/llvm/build/HOST/bin/lldb-tblgen" [ "$_lldb_enable" = "yes" ] && configure_args+=" -DLLDB_TABLEGEN=${wrksrc}/llvm/build/HOST/bin/lldb-tblgen" cd ../.. fi @@ -298,9 +308,9 @@ lld_package() { short_desc+=" - linker" homepage="https://lld.llvm.org" pkg_install() { - vmove usr/bin/ld.lld* - vmove usr/bin/ld64.lld* - vmove usr/bin/lld* + vmove "usr/bin/ld.lld*" + vmove "usr/bin/ld64.lld*" + vmove "usr/bin/lld*" vmove usr/bin/wasm-ld vmove usr/share/doc/LLVM/lld } @@ -324,9 +334,9 @@ lldb_package() { short_desc+=" - LLDB debugger" homepage="https://lldb.llvm.org/" pkg_install() { - vmove usr/bin/*lldb* - vmove usr/lib/liblldb*so.* - vmove /usr/lib/python* + vmove "usr/bin/*lldb*" + vmove "usr/lib/liblldb*so.*" + vmove usr/lib/python* } } @@ -343,7 +353,7 @@ lldb-devel_package() { llvm-libunwind_package() { short_desc+=" - libunwind" pkg_install() { - vmove "usr/lib/${XBPS_TRIPLET}/libunwind.so.*" + vmove "usr/lib/libunwind.so.*" } } @@ -354,8 +364,8 @@ llvm-libunwind-devel_package() { pkg_install() { vmove usr/include/mach-o vmove "usr/include/*unwind*" - vmove "usr/lib/${XBPS_TRIPLET}/libunwind.a" - vmove "usr/lib/${XBPS_TRIPLET}/libunwind.so" + vmove "usr/lib/libunwind.a" + vmove "usr/lib/libunwind.so" vmove usr/share/doc/LLVM/libunwind } } @@ -363,7 +373,7 @@ llvm-libunwind-devel_package() { libcxxabi_package() { short_desc+=" - low level support for libc++" pkg_install() { - vmove "usr/lib/${XBPS_TRIPLET}/libc++abi.so.*" + vmove "usr/lib/libc++abi.so.*" } } @@ -372,15 +382,15 @@ libcxxabi-devel_package() { depends="libcxxabi>=${version}_${revision}" pkg_install() { vmove "usr/include/*cxxabi*" - vmove "usr/lib/${XBPS_TRIPLET}/libc++abi.so" - vmove "usr/lib/${XBPS_TRIPLET}/libc++abi.a" + vmove "usr/lib/libc++abi.so" + vmove "usr/lib/libc++abi.a" } } libcxx_package() { short_desc+=" - C++ standard library" pkg_install() { - vmove "usr/lib/${XBPS_TRIPLET}/libc++.so.*" + vmove "usr/lib/libc++.so.*" } } @@ -389,9 +399,9 @@ libcxx-devel_package() { depends="libcxx>=${version}_${revision}" pkg_install() { vmove usr/include/c++ - vmove "usr/lib/${XBPS_TRIPLET}/libc++.so" - vmove "usr/lib/${XBPS_TRIPLET}/libc++.a" - vmove "usr/lib/${XBPS_TRIPLET}/libc++experimental.a" + vmove "usr/lib/libc++.so" + vmove "usr/lib/libc++.a" + vmove "usr/lib/libc++experimental.a" vmove usr/share/doc/LLVM/libcxx } } ```