From 48cee88161cddf2f52f7faa958d6af25d60a3041 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Thu, 2 Nov 2023 23:10:07 -0400 Subject: [PATCH 01/30] New package: llvm17 --- common/shlibs | 18 +- srcpkgs/clang | 2 +- srcpkgs/{clang-analyzer => clang-analyzer15} | 0 srcpkgs/clang-analyzer17 | 1 + srcpkgs/clang-tools-extra | 2 +- srcpkgs/{lld-devel => clang-tools-extra15} | 0 srcpkgs/clang-tools-extra17 | 1 + srcpkgs/{lldb-devel => clang15} | 0 srcpkgs/clang17 | 1 + srcpkgs/clang17-devel | 1 + srcpkgs/flang17 | 1 + srcpkgs/flang17-devel | 1 + srcpkgs/libclang | 2 +- srcpkgs/libclang-cpp | 2 +- srcpkgs/libclang-cpp15 | 1 + srcpkgs/libclang-cpp17 | 1 + srcpkgs/libclang15 | 1 + srcpkgs/libclang17 | 1 + srcpkgs/libcxx | 2 +- srcpkgs/libcxx-devel | 2 +- srcpkgs/libcxx15-devel | 1 + srcpkgs/libcxxabi | 2 +- srcpkgs/libcxxabi-devel | 2 +- srcpkgs/libcxxabi15-devel | 1 + srcpkgs/libllvm | 1 + srcpkgs/libllvm17 | 1 + srcpkgs/libomp | 2 +- srcpkgs/libomp-devel | 2 +- srcpkgs/lld | 2 +- srcpkgs/lld15 | 1 + srcpkgs/lld15-devel | 1 + srcpkgs/lld17 | 1 + srcpkgs/lld17-devel | 1 + srcpkgs/lldb | 2 +- srcpkgs/lldb15 | 1 + srcpkgs/lldb15-devel | 1 + srcpkgs/lldb17 | 1 + srcpkgs/lldb17-devel | 1 + srcpkgs/llvm-bolt | 1 + srcpkgs/llvm-bolt17 | 1 + srcpkgs/llvm-libunwind | 2 +- srcpkgs/llvm-libunwind-devel | 2 +- srcpkgs/llvm/template | 42 +- srcpkgs/llvm15/template | 194 +---- srcpkgs/llvm17-devel | 1 + .../llvm17/files/llvm-Config-llvm-config.h | 9 + srcpkgs/llvm17/llvm | 1 + srcpkgs/llvm17/patches/SmallVector.patch | 13 + ...clang-001-fix-unwind-chain-inclusion.patch | 44 ++ .../patches/clang-002-add-musl-triples.patch | 115 +++ .../clang-003-ppc64-dynamic-linker-path.patch | 13 + .../compiler-rt-sanitizer-ppc64-musl.patch | 37 + ...compiler-rt-sanitizer-supported-arch.patch | 22 + srcpkgs/llvm17/patches/libcxx-armv67.patch | 35 + srcpkgs/llvm17/patches/libcxx-musl.patch | 27 + .../llvm17/patches/libcxx-ssp-nonshared.patch | 11 + srcpkgs/llvm17/patches/libcxxabi-dl.patch | 25 + srcpkgs/llvm17/patches/libomp-soname.patch | 12 + srcpkgs/llvm17/patches/llvm-001-musl.patch | 44 ++ .../patches/llvm-004-override-opt.patch | 18 + .../llvm17/patches/llvm-005-ppc-bigpic.patch | 36 + .../patches/llvm-006-aarch64-mf_exec.patch | 24 + srcpkgs/llvm17/template | 668 ++++++++++++++++++ srcpkgs/llvm17/update | 3 + srcpkgs/mlir17 | 1 + srcpkgs/mlir17-devel | 1 + srcpkgs/removed-packages/template | 5 +- 67 files changed, 1275 insertions(+), 196 deletions(-) rename srcpkgs/{clang-analyzer => clang-analyzer15} (100%) create mode 120000 srcpkgs/clang-analyzer17 rename srcpkgs/{lld-devel => clang-tools-extra15} (100%) create mode 120000 srcpkgs/clang-tools-extra17 rename srcpkgs/{lldb-devel => clang15} (100%) create mode 120000 srcpkgs/clang17 create mode 120000 srcpkgs/clang17-devel create mode 120000 srcpkgs/flang17 create mode 120000 srcpkgs/flang17-devel create mode 120000 srcpkgs/libclang-cpp15 create mode 120000 srcpkgs/libclang-cpp17 create mode 120000 srcpkgs/libclang15 create mode 120000 srcpkgs/libclang17 create mode 120000 srcpkgs/libcxx15-devel create mode 120000 srcpkgs/libcxxabi15-devel create mode 120000 srcpkgs/libllvm create mode 120000 srcpkgs/libllvm17 create mode 120000 srcpkgs/lld15 create mode 120000 srcpkgs/lld15-devel create mode 120000 srcpkgs/lld17 create mode 120000 srcpkgs/lld17-devel create mode 120000 srcpkgs/lldb15 create mode 120000 srcpkgs/lldb15-devel create mode 120000 srcpkgs/lldb17 create mode 120000 srcpkgs/lldb17-devel create mode 120000 srcpkgs/llvm-bolt create mode 120000 srcpkgs/llvm-bolt17 create mode 120000 srcpkgs/llvm17-devel create mode 100644 srcpkgs/llvm17/files/llvm-Config-llvm-config.h create mode 120000 srcpkgs/llvm17/llvm create mode 100644 srcpkgs/llvm17/patches/SmallVector.patch create mode 100644 srcpkgs/llvm17/patches/clang-001-fix-unwind-chain-inclusion.patch create mode 100644 srcpkgs/llvm17/patches/clang-002-add-musl-triples.patch create mode 100644 srcpkgs/llvm17/patches/clang-003-ppc64-dynamic-linker-path.patch create mode 100644 srcpkgs/llvm17/patches/compiler-rt-sanitizer-ppc64-musl.patch create mode 100644 srcpkgs/llvm17/patches/compiler-rt-sanitizer-supported-arch.patch create mode 100644 srcpkgs/llvm17/patches/libcxx-armv67.patch create mode 100644 srcpkgs/llvm17/patches/libcxx-musl.patch create mode 100644 srcpkgs/llvm17/patches/libcxx-ssp-nonshared.patch create mode 100644 srcpkgs/llvm17/patches/libcxxabi-dl.patch create mode 100644 srcpkgs/llvm17/patches/libomp-soname.patch create mode 100644 srcpkgs/llvm17/patches/llvm-001-musl.patch create mode 100644 srcpkgs/llvm17/patches/llvm-004-override-opt.patch create mode 100644 srcpkgs/llvm17/patches/llvm-005-ppc-bigpic.patch create mode 100644 srcpkgs/llvm17/patches/llvm-006-aarch64-mf_exec.patch create mode 100644 srcpkgs/llvm17/template create mode 100644 srcpkgs/llvm17/update create mode 120000 srcpkgs/mlir17 create mode 120000 srcpkgs/mlir17-devel diff --git a/common/shlibs b/common/shlibs index 71f172740e5c6..360a047553f5f 100644 --- a/common/shlibs +++ b/common/shlibs @@ -982,15 +982,19 @@ libuchardet.so.0 uchardet-0.0.6_1 libgtksourceviewmm-3.0.so.0 gtksourceviewmm-3.2.0_1 libyajl.so.2 yajl-2.0.1_1 libconfuse.so.2 confuse-3.2.1_1 -liblldb.so.15 lldb-15.0.7_1 -libclang.so.15 libclang-15.0.7_1 -libclang-cpp.so.15 libclang-cpp-15.0.7_1 +liblldb.so.17 lldb17-17.0.6_1 +liblldb.so.15 lldb15-15.0.7_4 +libclang.so.17 libclang17-17.0.6_1 +libclang.so.15 libclang15-15.0.7_4 +libclang-cpp.so.17 libclang-cpp17-17.0.6_1 +libclang-cpp.so.15 libclang-cpp15-15.0.7_4 libLLVM-11.so libllvm11-11.0.0_1 libLLVM-12.so libllvm12-12.0.0_1 -libLLVM-15.so libllvm15-15.0.7_1 -libLLVMSPIRVLib.so.15 SPIRV-LLVM-Translator-15.0.0_1 -libomp.so.5 libomp-15.0.7_1 -libomptarget.so.15 libomp-15.0.7_1 +libLLVM-15.so libllvm15-15.0.7_4 +libLLVM-17.so libllvm17-17.0.6_1 +libLLVMSPIRVLib.so.17 SPIRV-LLVM-Translator-17.0.0_1 +libomp.so.5 libomp-17.0.6_1 +libomptarget.so.17 libomp-17.0.3_1 libisofs.so.6 libisofs-0.6.24_1 libmpack.so.0 libmpack-1.0.5_1 libGeoIP.so.1 libgeoip-1.4.8_1 diff --git a/srcpkgs/clang b/srcpkgs/clang index ad57a969b9f9c..0d68131b9b308 120000 --- a/srcpkgs/clang +++ b/srcpkgs/clang @@ -1 +1 @@ -llvm15 \ No newline at end of file +llvm \ No newline at end of file diff --git a/srcpkgs/clang-analyzer b/srcpkgs/clang-analyzer15 similarity index 100% rename from srcpkgs/clang-analyzer rename to srcpkgs/clang-analyzer15 diff --git a/srcpkgs/clang-analyzer17 b/srcpkgs/clang-analyzer17 new file mode 120000 index 0000000000000..96970d5c02c13 --- /dev/null +++ b/srcpkgs/clang-analyzer17 @@ -0,0 +1 @@ +llvm17 \ No newline at end of file diff --git a/srcpkgs/clang-tools-extra b/srcpkgs/clang-tools-extra index ad57a969b9f9c..0d68131b9b308 120000 --- a/srcpkgs/clang-tools-extra +++ b/srcpkgs/clang-tools-extra @@ -1 +1 @@ -llvm15 \ No newline at end of file +llvm \ No newline at end of file diff --git a/srcpkgs/lld-devel b/srcpkgs/clang-tools-extra15 similarity index 100% rename from srcpkgs/lld-devel rename to srcpkgs/clang-tools-extra15 diff --git a/srcpkgs/clang-tools-extra17 b/srcpkgs/clang-tools-extra17 new file mode 120000 index 0000000000000..96970d5c02c13 --- /dev/null +++ b/srcpkgs/clang-tools-extra17 @@ -0,0 +1 @@ +llvm17 \ No newline at end of file diff --git a/srcpkgs/lldb-devel b/srcpkgs/clang15 similarity index 100% rename from srcpkgs/lldb-devel rename to srcpkgs/clang15 diff --git a/srcpkgs/clang17 b/srcpkgs/clang17 new file mode 120000 index 0000000000000..96970d5c02c13 --- /dev/null +++ b/srcpkgs/clang17 @@ -0,0 +1 @@ +llvm17 \ No newline at end of file diff --git a/srcpkgs/clang17-devel b/srcpkgs/clang17-devel new file mode 120000 index 0000000000000..96970d5c02c13 --- /dev/null +++ b/srcpkgs/clang17-devel @@ -0,0 +1 @@ +llvm17 \ No newline at end of file diff --git a/srcpkgs/flang17 b/srcpkgs/flang17 new file mode 120000 index 0000000000000..96970d5c02c13 --- /dev/null +++ b/srcpkgs/flang17 @@ -0,0 +1 @@ +llvm17 \ No newline at end of file diff --git a/srcpkgs/flang17-devel b/srcpkgs/flang17-devel new file mode 120000 index 0000000000000..96970d5c02c13 --- /dev/null +++ b/srcpkgs/flang17-devel @@ -0,0 +1 @@ +llvm17 \ No newline at end of file diff --git a/srcpkgs/libclang b/srcpkgs/libclang index ad57a969b9f9c..0d68131b9b308 120000 --- a/srcpkgs/libclang +++ b/srcpkgs/libclang @@ -1 +1 @@ -llvm15 \ No newline at end of file +llvm \ No newline at end of file diff --git a/srcpkgs/libclang-cpp b/srcpkgs/libclang-cpp index ad57a969b9f9c..0d68131b9b308 120000 --- a/srcpkgs/libclang-cpp +++ b/srcpkgs/libclang-cpp @@ -1 +1 @@ -llvm15 \ No newline at end of file +llvm \ No newline at end of file diff --git a/srcpkgs/libclang-cpp15 b/srcpkgs/libclang-cpp15 new file mode 120000 index 0000000000000..ad57a969b9f9c --- /dev/null +++ b/srcpkgs/libclang-cpp15 @@ -0,0 +1 @@ +llvm15 \ No newline at end of file diff --git a/srcpkgs/libclang-cpp17 b/srcpkgs/libclang-cpp17 new file mode 120000 index 0000000000000..96970d5c02c13 --- /dev/null +++ b/srcpkgs/libclang-cpp17 @@ -0,0 +1 @@ +llvm17 \ No newline at end of file diff --git a/srcpkgs/libclang15 b/srcpkgs/libclang15 new file mode 120000 index 0000000000000..ad57a969b9f9c --- /dev/null +++ b/srcpkgs/libclang15 @@ -0,0 +1 @@ +llvm15 \ No newline at end of file diff --git a/srcpkgs/libclang17 b/srcpkgs/libclang17 new file mode 120000 index 0000000000000..96970d5c02c13 --- /dev/null +++ b/srcpkgs/libclang17 @@ -0,0 +1 @@ +llvm17 \ No newline at end of file diff --git a/srcpkgs/libcxx b/srcpkgs/libcxx index ad57a969b9f9c..96970d5c02c13 120000 --- a/srcpkgs/libcxx +++ b/srcpkgs/libcxx @@ -1 +1 @@ -llvm15 \ No newline at end of file +llvm17 \ No newline at end of file diff --git a/srcpkgs/libcxx-devel b/srcpkgs/libcxx-devel index ad57a969b9f9c..96970d5c02c13 120000 --- a/srcpkgs/libcxx-devel +++ b/srcpkgs/libcxx-devel @@ -1 +1 @@ -llvm15 \ No newline at end of file +llvm17 \ No newline at end of file diff --git a/srcpkgs/libcxx15-devel b/srcpkgs/libcxx15-devel new file mode 120000 index 0000000000000..ad57a969b9f9c --- /dev/null +++ b/srcpkgs/libcxx15-devel @@ -0,0 +1 @@ +llvm15 \ No newline at end of file diff --git a/srcpkgs/libcxxabi b/srcpkgs/libcxxabi index ad57a969b9f9c..96970d5c02c13 120000 --- a/srcpkgs/libcxxabi +++ b/srcpkgs/libcxxabi @@ -1 +1 @@ -llvm15 \ No newline at end of file +llvm17 \ No newline at end of file diff --git a/srcpkgs/libcxxabi-devel b/srcpkgs/libcxxabi-devel index ad57a969b9f9c..96970d5c02c13 120000 --- a/srcpkgs/libcxxabi-devel +++ b/srcpkgs/libcxxabi-devel @@ -1 +1 @@ -llvm15 \ No newline at end of file +llvm17 \ No newline at end of file diff --git a/srcpkgs/libcxxabi15-devel b/srcpkgs/libcxxabi15-devel new file mode 120000 index 0000000000000..ad57a969b9f9c --- /dev/null +++ b/srcpkgs/libcxxabi15-devel @@ -0,0 +1 @@ +llvm15 \ No newline at end of file diff --git a/srcpkgs/libllvm b/srcpkgs/libllvm new file mode 120000 index 0000000000000..0d68131b9b308 --- /dev/null +++ b/srcpkgs/libllvm @@ -0,0 +1 @@ +llvm \ No newline at end of file diff --git a/srcpkgs/libllvm17 b/srcpkgs/libllvm17 new file mode 120000 index 0000000000000..96970d5c02c13 --- /dev/null +++ b/srcpkgs/libllvm17 @@ -0,0 +1 @@ +llvm17 \ No newline at end of file diff --git a/srcpkgs/libomp b/srcpkgs/libomp index ad57a969b9f9c..96970d5c02c13 120000 --- a/srcpkgs/libomp +++ b/srcpkgs/libomp @@ -1 +1 @@ -llvm15 \ No newline at end of file +llvm17 \ No newline at end of file diff --git a/srcpkgs/libomp-devel b/srcpkgs/libomp-devel index ad57a969b9f9c..96970d5c02c13 120000 --- a/srcpkgs/libomp-devel +++ b/srcpkgs/libomp-devel @@ -1 +1 @@ -llvm15 \ No newline at end of file +llvm17 \ No newline at end of file diff --git a/srcpkgs/lld b/srcpkgs/lld index ad57a969b9f9c..0d68131b9b308 120000 --- a/srcpkgs/lld +++ b/srcpkgs/lld @@ -1 +1 @@ -llvm15 \ No newline at end of file +llvm \ No newline at end of file diff --git a/srcpkgs/lld15 b/srcpkgs/lld15 new file mode 120000 index 0000000000000..ad57a969b9f9c --- /dev/null +++ b/srcpkgs/lld15 @@ -0,0 +1 @@ +llvm15 \ No newline at end of file diff --git a/srcpkgs/lld15-devel b/srcpkgs/lld15-devel new file mode 120000 index 0000000000000..ad57a969b9f9c --- /dev/null +++ b/srcpkgs/lld15-devel @@ -0,0 +1 @@ +llvm15 \ No newline at end of file diff --git a/srcpkgs/lld17 b/srcpkgs/lld17 new file mode 120000 index 0000000000000..96970d5c02c13 --- /dev/null +++ b/srcpkgs/lld17 @@ -0,0 +1 @@ +llvm17 \ No newline at end of file diff --git a/srcpkgs/lld17-devel b/srcpkgs/lld17-devel new file mode 120000 index 0000000000000..96970d5c02c13 --- /dev/null +++ b/srcpkgs/lld17-devel @@ -0,0 +1 @@ +llvm17 \ No newline at end of file diff --git a/srcpkgs/lldb b/srcpkgs/lldb index ad57a969b9f9c..0d68131b9b308 120000 --- a/srcpkgs/lldb +++ b/srcpkgs/lldb @@ -1 +1 @@ -llvm15 \ No newline at end of file +llvm \ No newline at end of file diff --git a/srcpkgs/lldb15 b/srcpkgs/lldb15 new file mode 120000 index 0000000000000..ad57a969b9f9c --- /dev/null +++ b/srcpkgs/lldb15 @@ -0,0 +1 @@ +llvm15 \ No newline at end of file diff --git a/srcpkgs/lldb15-devel b/srcpkgs/lldb15-devel new file mode 120000 index 0000000000000..ad57a969b9f9c --- /dev/null +++ b/srcpkgs/lldb15-devel @@ -0,0 +1 @@ +llvm15 \ No newline at end of file diff --git a/srcpkgs/lldb17 b/srcpkgs/lldb17 new file mode 120000 index 0000000000000..96970d5c02c13 --- /dev/null +++ b/srcpkgs/lldb17 @@ -0,0 +1 @@ +llvm17 \ No newline at end of file diff --git a/srcpkgs/lldb17-devel b/srcpkgs/lldb17-devel new file mode 120000 index 0000000000000..96970d5c02c13 --- /dev/null +++ b/srcpkgs/lldb17-devel @@ -0,0 +1 @@ +llvm17 \ No newline at end of file diff --git a/srcpkgs/llvm-bolt b/srcpkgs/llvm-bolt new file mode 120000 index 0000000000000..96970d5c02c13 --- /dev/null +++ b/srcpkgs/llvm-bolt @@ -0,0 +1 @@ +llvm17 \ No newline at end of file diff --git a/srcpkgs/llvm-bolt17 b/srcpkgs/llvm-bolt17 new file mode 120000 index 0000000000000..96970d5c02c13 --- /dev/null +++ b/srcpkgs/llvm-bolt17 @@ -0,0 +1 @@ +llvm17 \ No newline at end of file diff --git a/srcpkgs/llvm-libunwind b/srcpkgs/llvm-libunwind index ad57a969b9f9c..96970d5c02c13 120000 --- a/srcpkgs/llvm-libunwind +++ b/srcpkgs/llvm-libunwind @@ -1 +1 @@ -llvm15 \ No newline at end of file +llvm17 \ No newline at end of file diff --git a/srcpkgs/llvm-libunwind-devel b/srcpkgs/llvm-libunwind-devel index ad57a969b9f9c..96970d5c02c13 120000 --- a/srcpkgs/llvm-libunwind-devel +++ b/srcpkgs/llvm-libunwind-devel @@ -1 +1 @@ -llvm15 \ No newline at end of file +llvm17 \ No newline at end of file diff --git a/srcpkgs/llvm/template b/srcpkgs/llvm/template index fc1c850bd26fd..b8967217e0f29 100644 --- a/srcpkgs/llvm/template +++ b/srcpkgs/llvm/template @@ -1,11 +1,47 @@ # Template file for 'llvm' pkgname=llvm -version=15 +version=17 revision=1 build_style=meta -depends="llvm15" +depends="llvm17" short_desc="LLVM meta package" maintainer="Enno Boland " license="Public Domain" homepage="https://www.voidlinux.org" -replaces="llvm12>=0 llvm11>=0 llvm10>=0 llvm9>=0 llvm8>=0 llvm7>=0 llvm6.0>=0 llvm3.9>=0" +replaces="llvm15>=0 llvm12>=0 llvm11>=0 llvm10>=0 llvm9>=0 llvm8>=0 llvm7>=0 llvm6.0>=0 llvm3.9>=0" + +libclang_package() { + build_style=meta + depends="libclang${version}>=0" + short_desc+=" - libclang" +} +libclang-cpp_package() { + build_style=meta + depends="libclang-cpp${version}>=0" + short_desc+=" - libclang-cpp" +} +libllvm_package() { + build_style=meta + depends="libllvm${version}>=0" + short_desc+=" - libllvm" +} +clang_package() { + build_style=meta + depends="clang${version}>=0" + short_desc+=" - clang" +} +clang-tools-extra_package() { + build_style=meta + depends="clang-tools-extra${version}>=0" + short_desc+=" - clang-tools-extra" +} +lld_package() { + build_style=meta + depends="lld${version}>=0" + short_desc+=" - lld" +} +lldb_package() { + build_style=meta + depends="lldb${version}>=0" + short_desc+=" - lldb" +} diff --git a/srcpkgs/llvm15/template b/srcpkgs/llvm15/template index 24f73810c3aa5..6a939bb08fef1 100644 --- a/srcpkgs/llvm15/template +++ b/srcpkgs/llvm15/template @@ -1,7 +1,7 @@ # Template file for 'llvm15' pkgname=llvm15 version=15.0.7 -revision=3 +revision=4 build_wrksrc=llvm build_style=cmake _ext_suffix=".cpython-${py3_ver/./}-linux-${XBPS_TARGET_LIBC/glibc/gnu}.so" @@ -9,15 +9,6 @@ configure_args=" -DCMAKE_BUILD_TYPE=Release -Wno-dev -DENABLE_LINKER_BUILD_ID=YES -DLLDB_USE_SYSTEM_SIX=YES - -DLIBCXX_CXX_ABI=libcxxabi - -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=YES - -DLIBCXXABI_USE_LLVM_UNWINDER=YES - -DLIBCXXABI_ENABLE_STATIC_UNWINDER=YES - -DLIBOMP_ENABLE_SHARED=YES - -DLIBOMP_INSTALL_ALIASES=NO - -DLLVM_INCLUDE_DOCS=YES - -DLLVM_BUILD_DOCS=YES - -DLLVM_ENABLE_SPHINX=YES -DSPHINX_WARNINGS_AS_ERRORS=NO -DLLVM_INSTALL_UTILS=YES -DLLVM_BUILD_LLVM_DYLIB=YES @@ -29,13 +20,12 @@ configure_args=" -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" +hostmakedepends="perl python3 zlib-devel libffi-devel swig" makedepends="python3-devel zlib-devel elfutils-devel libffi-devel libedit-devel libxml2-devel binutils-devel" depends="libllvm15>=${version}_${revision}" -short_desc="Low Level Virtual Machine" -maintainer="Orphaned " +short_desc="LLVM Compiler Infrastructure Project - Version 15" +maintainer="Daniel Martinez " license="Apache-2.0" homepage="https://www.llvm.org" distfiles="https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/llvm-project-${version}.src.tar.xz" @@ -54,46 +44,26 @@ case "$XBPS_TARGET_MACHINE" in ppc*) configure_args+=" -DCLANG_ENABLE_CLANGD=OFF" ;; esac -_enabled_projects="clang;clang-tools-extra;compiler-rt;libcxx;libcxxabi;libunwind;lld" +_enabled_projects="clang;clang-tools-extra;compiler-rt;lld" _lldb_enable=yes -_libomp_enable=no case "$XBPS_TARGET_MACHINE" in ppc64le*) ;; ppc*|i686*|riscv64*) _lldb_enable=no ;; esac -case "$XBPS_TARGET_MACHINE" in - x86_64*|aarch64*|ppc64*) _libomp_enable=yes;; -esac - -subpackages="clang-tools-extra" - -# must go before clang -if [ "$_libomp_enable" = "yes" ]; then - _enabled_projects+=";openmp" - subpackages+=" libomp libomp-devel" - # because of cmake nonsense referencing libomptarget.so.* - depends+=" libomp>=${version}_${revision}" - if [ "$CROSS_BUILD" ]; then - # Seems to require a full host llvm/clang build - configure_args+=" -DLIBOMPTARGET_BUILD_CUDA_PLUGIN=OFF" - configure_args+=" -DLIBOMPTARGET_BUILD_AMDGPU_PLUGIN=OFF" - fi -fi -subpackages+=" clang clang-analyzer libclang libclang-cpp - llvm-libunwind llvm-libunwind-devel libcxx libcxx-devel - libcxxabi libcxxabi-devel libllvm15" +subpackages="clang-tools-extra15 clang15 clang-analyzer15 libclang15 libclang-cpp15 + libllvm15" if [ "$_lldb_enable" = "yes" ]; then # XXX fails to cross compile due to python _enabled_projects+=";lldb" - subpackages+=" lldb lldb-devel" + subpackages+=" lldb15 lldb15-devel" fi -subpackages+=" lld lld-devel" +subpackages+=" lld15 lld15-devel" configure_args+=" -DLLVM_ENABLE_PROJECTS=${_enabled_projects}" @@ -103,32 +73,11 @@ post_patch() { vsed -i 's|__ptrace_request|int|g' \ ${wrksrc}/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp fi - # disable docs for lldb as they fail to generate - vsed -i '/add_subdirectory(docs)/d' \ - ${wrksrc}/lldb/CMakeLists.txt fi # update config.guess for better platform detection cp $XBPS_COMMONDIR/environment/configure/automake/config.guess \ ${wrksrc}/llvm/cmake - - # fix linker failures on some archs - vsed -i 's,check_library_exists(gcc_s .*,set(LIBCXXABI_HAS_GCC_S_LIB ON),' \ - ${wrksrc}/libcxxabi/cmake/config-ix.cmake - vsed -i 's,check_library_exists(gcc .*,set(LIBCXXABI_HAS_GCC_LIB ON),' \ - ${wrksrc}/libcxxabi/cmake/config-ix.cmake - - # need libssp_nonshared on some musl platforms (because of nodefaultlibs) - case "$XBPS_TARGET_MACHINE" in - ppc64*) ;; - ppc*-musl|i686-musl|mips*-musl) - vsed -i 's,^# Setup flags.$,add_library_flags(ssp_nonshared),' \ - ${wrksrc}/libunwind/src/CMakeLists.txt - vsed -i 's,^# Setup flags.$,add_library_flags(ssp_nonshared),' \ - ${wrksrc}/libcxxabi/src/CMakeLists.txt - vsed -i 's,#ssp,,' ${wrksrc}/libcxx/CMakeLists.txt - ;; - esac } pre_configure() { @@ -211,22 +160,11 @@ do_install() { if [ "$CROSS_BUILD" ]; then rm -f ${DESTDIR}/usr/bin/llvm-config-host fi - - # Install libcxxabi headers - vinstall ${wrksrc}/libcxxabi/include/__cxxabi_config.h 644 usr/include - vinstall ${wrksrc}/libcxxabi/include/cxxabi.h 644 usr/include - - # Install libunwind headers - vinstall ${wrksrc}/libunwind/include/__libunwind_config.h 644 usr/include - vinstall ${wrksrc}/libunwind/include/libunwind.h 644 usr/include - vinstall ${wrksrc}/libunwind/include/unwind.h 644 usr/include - vinstall ${wrksrc}/libunwind/include/mach-o/compact_unwind_encoding.h \ - 644 usr/include/mach-o } -clang-analyzer_package() { +clang-analyzer15_package() { pycompile_dirs="usr/share/scan-view" - depends="clang-${version}_${revision} python3 perl" + depends="clang15-${version}_${revision} python3 perl" short_desc+=" - A source code analysis framework" homepage="https://clang-analyzer.llvm.org/" pkg_install() { @@ -237,9 +175,9 @@ clang-analyzer_package() { } } -clang-tools-extra_package() { +clang-tools-extra15_package() { lib32disabled=yes - depends="clang-${version}_${revision} python3" + depends="clang15-${version}_${revision} python3" short_desc+=" - Extra Clang tools" homepage="https://clang.llvm.org/extra/" pkg_install() { @@ -274,15 +212,13 @@ clang-tools-extra_package() { vmove "usr/share/clang/*find-all-symbols*" vmove "usr/share/clang/*include-fixer*" vmove "usr/share/clang/*tidy*" - vmove usr/share/doc/LLVM/clang-tools - vmove usr/share/man/man1/extraclangtools.1 } } -clang_package() { +clang15_package() { lib32disabled=yes depends="libstdc++-devel libgcc-devel binutils ${XBPS_TARGET_LIBC}-devel - libclang-${version}_${revision}" + libclang15-${version}_${revision}" short_desc+=" - C language family frontend" homepage="https://clang.llvm.org/" pkg_install() { @@ -296,27 +232,24 @@ clang_package() { vmove "usr/lib/libclang*.a" vmove "usr/lib/libclang*.so" vmove usr/share/clang - vmove usr/share/doc/LLVM/clang - vmove usr/share/man/man1/clang.1 - vmove usr/share/man/man1/diagtool.1 } } -libclang_package() { +libclang15_package() { short_desc+=" - C frontend runtime library" pkg_install() { vmove "usr/lib/libclang.so.*" } } -libclang-cpp_package() { +libclang-cpp15_package() { short_desc+=" - C frontend runtime library (C++ interface)" pkg_install() { vmove "usr/lib/libclang-cpp.so.*" } } -lld_package() { +lld15_package() { lib32disabled=yes short_desc+=" - linker" homepage="https://lld.llvm.org" @@ -325,15 +258,14 @@ lld_package() { vmove "usr/bin/ld64.lld*" vmove "usr/bin/lld*" vmove usr/bin/wasm-ld - vmove usr/share/doc/LLVM/lld } } -lld-devel_package() { +lld15-devel_package() { lib32disabled=yes short_desc+=" - linker - development files" homepage="https://lld.llvm.org" - depends="lld>=${version}_${revision}" + depends="lld15>=${version}_${revision}" pkg_install() { vmove usr/include/lld vmove usr/lib/cmake/lld @@ -341,7 +273,7 @@ lld-devel_package() { } } -lldb_package() { +lldb15_package() { lib32disabled=yes depends+=" python3-six" short_desc+=" - LLDB debugger" @@ -353,9 +285,9 @@ lldb_package() { } } -lldb-devel_package() { +lldb15-devel_package() { lib32disabled=yes - depends="lldb>=${version}_${revision}" + depends="lldb15>=${version}_${revision}" short_desc+=" - LLDB debugger - development files" pkg_install() { vmove usr/include/lldb @@ -363,86 +295,6 @@ lldb-devel_package() { } } -llvm-libunwind_package() { - short_desc+=" - libunwind" - pkg_install() { - vmove "usr/lib/libunwind.so.*" - } -} - -llvm-libunwind-devel_package() { - short_desc+=" - libunwind - development files" - depends="llvm-libunwind>=${version}_${revision}" - conflicts="libunwind-devel>=0" - pkg_install() { - vmove usr/include/mach-o - vmove "usr/include/*unwind*" - vmove "usr/lib/libunwind.a" - vmove "usr/lib/libunwind.so" - vmove usr/share/doc/LLVM/libunwind - } -} - -libcxxabi_package() { - short_desc+=" - low level support for libc++" - pkg_install() { - vmove "usr/lib/libc++abi.so.*" - } -} - -libcxxabi-devel_package() { - short_desc+=" - low level support for libc++ - development files" - depends="libcxxabi>=${version}_${revision}" - pkg_install() { - vmove "usr/include/*cxxabi*" - vmove "usr/lib/libc++abi.so" - vmove "usr/lib/libc++abi.a" - } -} - -libcxx_package() { - short_desc+=" - C++ standard library" - pkg_install() { - vmove "usr/lib/libc++.so.*" - } -} - -libcxx-devel_package() { - short_desc+=" - C++ standard library - development files" - depends="libcxx>=${version}_${revision}" - pkg_install() { - vmove usr/include/c++ - vmove "usr/lib/libc++.so" - vmove "usr/lib/libc++.a" - vmove "usr/lib/libc++experimental.a" - vmove usr/share/doc/LLVM/libcxx - } -} - -libomp_package() { - short_desc+=" - Clang OpenMP support library" - pkg_install() { - vmove usr/lib/libarcher.so - vmove usr/lib/libompd.so - vmove "usr/lib/libomptarget.rtl.*.so" - vmove "usr/lib/libomp*.so.*" - } -} - -libomp-devel_package() { - short_desc+=" - Clang OpenMP support library - development files" - depends="libomp>=${version}_${revision}" - pkg_install() { - vmove "usr/include/omp*.h" - vmove "usr/lib/clang/${version}/include/omp*.h" - vmove "usr/lib/libarcher*" - vmove "usr/lib/libomp*.so" - vmove usr/lib/cmake/openmp - vmove usr/share/doc/LLVM/openmp - vmove usr/share/man/man1/llvmopenmp.1 - } -} - libllvm15_package() { short_desc+=" - runtime library" pkg_install() { diff --git a/srcpkgs/llvm17-devel b/srcpkgs/llvm17-devel new file mode 120000 index 0000000000000..96970d5c02c13 --- /dev/null +++ b/srcpkgs/llvm17-devel @@ -0,0 +1 @@ +llvm17 \ No newline at end of file diff --git a/srcpkgs/llvm17/files/llvm-Config-llvm-config.h b/srcpkgs/llvm17/files/llvm-Config-llvm-config.h new file mode 100644 index 0000000000000..2fa08c9be6962 --- /dev/null +++ b/srcpkgs/llvm17/files/llvm-Config-llvm-config.h @@ -0,0 +1,9 @@ +#include + +#if __WORDSIZE == 32 +#include "llvm-config-32.h" +#elif __WORDSIZE == 64 +#include "llvm-config-64.h" +#else +#error "Unknown word size" +#endif diff --git a/srcpkgs/llvm17/llvm b/srcpkgs/llvm17/llvm new file mode 120000 index 0000000000000..0d68131b9b308 --- /dev/null +++ b/srcpkgs/llvm17/llvm @@ -0,0 +1 @@ +llvm \ No newline at end of file diff --git a/srcpkgs/llvm17/patches/SmallVector.patch b/srcpkgs/llvm17/patches/SmallVector.patch new file mode 100644 index 0000000000000..ac10d306c4346 --- /dev/null +++ b/srcpkgs/llvm17/patches/SmallVector.patch @@ -0,0 +1,13 @@ +diff --git a/llvm/include/llvm/ADT/SmallVector.h b/llvm/include/llvm/ADT/SmallVector.h +index 2e6d2dc6ce90..be2cf6cc1fee 100644 +--- a/llvm/include/llvm/ADT/SmallVector.h ++++ b/llvm/include/llvm/ADT/SmallVector.h +@@ -1163,7 +1163,7 @@ template struct CalculateSmallVectorDefaultInlinedElements { + // happens on a 32-bit host and then fails due to sizeof(T) *increasing* on a + // 64-bit host, is expected to be very rare. + static_assert( +- sizeof(T) <= 256, ++ sizeof(T) <= 288, + "You are trying to use a default number of inlined elements for " + "`SmallVector` but `sizeof(T)` is really big! Please use an " + "explicit number of inlined elements with `SmallVector` to make " diff --git a/srcpkgs/llvm17/patches/clang-001-fix-unwind-chain-inclusion.patch b/srcpkgs/llvm17/patches/clang-001-fix-unwind-chain-inclusion.patch new file mode 100644 index 0000000000000..e4eaa7783e7a6 --- /dev/null +++ b/srcpkgs/llvm17/patches/clang-001-fix-unwind-chain-inclusion.patch @@ -0,0 +1,44 @@ +From 352974169f0d2b5da3d5321f588f5e3b5941330e Mon Sep 17 00:00:00 2001 +From: Andrea Brancaleoni +Date: Tue, 8 Sep 2015 22:14:57 +0200 +Subject: [PATCH 2/7] fix unwind chain inclusion + +--- + lib/Headers/unwind.h | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) + +diff --git a/lib/Headers/unwind.h b/lib/Headers/unwind.h +index 303d792..44e10cc 100644 +--- a/clang/lib/Headers/unwind.h ++++ b/clang/lib/Headers/unwind.h +@@ -9,9 +9,6 @@ + + /* See "Data Definitions for libgcc_s" in the Linux Standard Base.*/ + +-#ifndef __CLANG_UNWIND_H +-#define __CLANG_UNWIND_H +- + #if defined(__APPLE__) && __has_include_next() + /* Darwin (from 11.x on) provide an unwind.h. If that's available, + * use it. libunwind wraps some of its definitions in #ifdef _GNU_SOURCE, +@@ -39,6 +36,9 @@ + # endif + #else + ++#ifndef __CLANG_UNWIND_H ++#define __CLANG_UNWIND_H ++ + #include + + #ifdef __cplusplus +@@ -322,6 +322,7 @@ _Unwind_Ptr _Unwind_GetTextRelBase(struct _Unwind_Context *); + } + #endif + ++#endif /* __CLANG_UNWIND_H */ ++ + #endif + +-#endif /* __CLANG_UNWIND_H */ +-- +2.5.1 diff --git a/srcpkgs/llvm17/patches/clang-002-add-musl-triples.patch b/srcpkgs/llvm17/patches/clang-002-add-musl-triples.patch new file mode 100644 index 0000000000000..0ef4c7e75d6b5 --- /dev/null +++ b/srcpkgs/llvm17/patches/clang-002-add-musl-triples.patch @@ -0,0 +1,115 @@ +--- a/clang/lib/Driver/ToolChains/Gnu.cpp ++++ b/clang/lib/Driver/ToolChains/Gnu.cpp +@@ -2086,7 +2086,8 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes( + static const char *const ARMHFTriples[] = {"arm-linux-gnueabihf", + "armv7hl-redhat-linux-gnueabi", + "armv6hl-suse-linux-gnueabi", +- "armv7hl-suse-linux-gnueabi"}; ++ "armv7hl-suse-linux-gnueabi", ++ "armv7l-linux-gnueabihf"}; + static const char *const ARMebLibDirs[] = {"/lib"}; + static const char *const ARMebTriples[] = {"armeb-linux-gnueabi", + "armeb-linux-androideabi"}; +@@ -2153,8 +2154,7 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes( + "powerpc64-suse-linux", "powerpc-montavista-linuxspe"}; + static const char *const PPCLELibDirs[] = {"/lib32", "/lib"}; + static const char *const PPCLETriples[] = {"powerpcle-linux-gnu", +- "powerpcle-unknown-linux-gnu", +- "powerpcle-linux-musl"}; ++ "powerpcle-unknown-linux-gnu"}; + + static const char *const PPC64LibDirs[] = {"/lib64", "/lib"}; + static const char *const PPC64Triples[] = { +@@ -2235,6 +2235,92 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes( + return; + } + ++ if (TargetTriple.isMusl()) { ++ static const char *const AArch64MuslTriples[] = {"aarch64-linux-musl"}; ++ static const char *const ARMHFMuslTriples[] = { ++ "arm-linux-musleabihf", "armv7l-linux-musleabihf" ++ }; ++ static const char *const ARMMuslTriples[] = {"arm-linux-musleabi"}; ++ static const char *const X86_64MuslTriples[] = {"x86_64-linux-musl"}; ++ static const char *const X86MuslTriples[] = {"i686-linux-musl"}; ++ static const char *const MIPSMuslTriples[] = { ++ "mips-linux-musl", "mipsel-linux-musl", ++ "mipsel-linux-muslhf", "mips-linux-muslhf" ++ }; ++ static const char *const PPCMuslTriples[] = {"powerpc-linux-musl"}; ++ static const char *const PPCLEMuslTriples[] = {"powerpcle-linux-musl"}; ++ static const char *const PPC64MuslTriples[] = {"powerpc64-linux-musl"}; ++ static const char *const PPC64LEMuslTriples[] = {"powerpc64le-linux-musl"}; ++ static const char *const RISCV64MuslTriples[] = {"riscv64-linux-musl"}; ++ ++ switch (TargetTriple.getArch()) { ++ case llvm::Triple::aarch64: ++ LibDirs.append(begin(AArch64LibDirs), end(AArch64LibDirs)); ++ TripleAliases.append(begin(AArch64MuslTriples), end(AArch64MuslTriples)); ++ BiarchLibDirs.append(begin(AArch64LibDirs), end(AArch64LibDirs)); ++ BiarchTripleAliases.append(begin(AArch64MuslTriples), end(AArch64MuslTriples)); ++ break; ++ case llvm::Triple::arm: ++ LibDirs.append(begin(ARMLibDirs), end(ARMLibDirs)); ++ if (TargetTriple.getEnvironment() == llvm::Triple::MuslEABIHF) { ++ TripleAliases.append(begin(ARMHFMuslTriples), end(ARMHFMuslTriples)); ++ } else { ++ TripleAliases.append(begin(ARMMuslTriples), end(ARMMuslTriples)); ++ } ++ break; ++ case llvm::Triple::x86_64: ++ LibDirs.append(begin(X86_64LibDirs), end(X86_64LibDirs)); ++ TripleAliases.append(begin(X86_64MuslTriples), end(X86_64MuslTriples)); ++ BiarchLibDirs.append(begin(X86LibDirs), end(X86LibDirs)); ++ BiarchTripleAliases.append(begin(X86MuslTriples), end(X86MuslTriples)); ++ break; ++ case llvm::Triple::x86: ++ LibDirs.append(begin(X86LibDirs), end(X86LibDirs)); ++ TripleAliases.append(begin(X86MuslTriples), end(X86MuslTriples)); ++ BiarchLibDirs.append(begin(X86_64LibDirs), end(X86_64LibDirs)); ++ BiarchTripleAliases.append(begin(X86_64MuslTriples), end(X86_64MuslTriples)); ++ break; ++ case llvm::Triple::mips: ++ LibDirs.append(begin(MIPSLibDirs), end(MIPSLibDirs)); ++ TripleAliases.append(begin(MIPSMuslTriples), end(MIPSMuslTriples)); ++ break; ++ case llvm::Triple::ppc: ++ LibDirs.append(begin(PPCLibDirs), end(PPCLibDirs)); ++ TripleAliases.append(begin(PPCMuslTriples), end(PPCMuslTriples)); ++ BiarchLibDirs.append(begin(PPC64LibDirs), end(PPC64LibDirs)); ++ BiarchTripleAliases.append(begin(PPC64MuslTriples), end(PPC64MuslTriples)); ++ break; ++ case llvm::Triple::ppcle: ++ LibDirs.append(begin(PPCLELibDirs), end(PPCLELibDirs)); ++ TripleAliases.append(begin(PPCLEMuslTriples), end(PPCLEMuslTriples)); ++ BiarchLibDirs.append(begin(PPC64LELibDirs), end(PPC64LELibDirs)); ++ BiarchTripleAliases.append(begin(PPC64LEMuslTriples), end(PPC64LEMuslTriples)); ++ break; ++ case llvm::Triple::ppc64: ++ LibDirs.append(begin(PPC64LibDirs), end(PPC64LibDirs)); ++ TripleAliases.append(begin(PPC64MuslTriples), end(PPC64MuslTriples)); ++ BiarchLibDirs.append(begin(PPCLibDirs), end(PPCLibDirs)); ++ BiarchTripleAliases.append(begin(PPCMuslTriples), end(PPCMuslTriples)); ++ break; ++ case llvm::Triple::ppc64le: ++ LibDirs.append(begin(PPC64LELibDirs), end(PPC64LELibDirs)); ++ TripleAliases.append(begin(PPC64LEMuslTriples), end(PPC64LEMuslTriples)); ++ BiarchLibDirs.append(begin(PPCLELibDirs), end(PPCLELibDirs)); ++ BiarchTripleAliases.append(begin(PPCLEMuslTriples), end(PPCLEMuslTriples)); ++ break; ++ case llvm::Triple::riscv64: ++ LibDirs.append(begin(RISCV64LibDirs), end(RISCV64LibDirs)); ++ TripleAliases.append(begin(RISCV64MuslTriples), end(RISCV64MuslTriples)); ++ break; ++ default: ++ break; ++ } ++ TripleAliases.push_back(TargetTriple.str()); ++ if (TargetTriple.str() != BiarchTriple.str()) ++ BiarchTripleAliases.push_back(BiarchTriple.str()); ++ return; ++ } ++ + // Android targets should not use GNU/Linux tools or libraries. + if (TargetTriple.isAndroid()) { + static const char *const AArch64AndroidTriples[] = { diff --git a/srcpkgs/llvm17/patches/clang-003-ppc64-dynamic-linker-path.patch b/srcpkgs/llvm17/patches/clang-003-ppc64-dynamic-linker-path.patch new file mode 100644 index 0000000000000..4ad6412d1e6c6 --- /dev/null +++ b/srcpkgs/llvm17/patches/clang-003-ppc64-dynamic-linker-path.patch @@ -0,0 +1,13 @@ +--- a/clang/lib/Driver/ToolChains/Linux.cpp ++++ b/clang/lib/Driver/ToolChains/Linux.cpp +@@ -504,10 +504,6 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const { + Loader = "ld.so.1"; + break; + case llvm::Triple::ppc64: +- LibDir = "lib64"; +- Loader = +- (tools::ppc::hasPPCAbiArg(Args, "elfv2")) ? "ld64.so.2" : "ld64.so.1"; +- break; + case llvm::Triple::ppc64le: + LibDir = "lib64"; + Loader = diff --git a/srcpkgs/llvm17/patches/compiler-rt-sanitizer-ppc64-musl.patch b/srcpkgs/llvm17/patches/compiler-rt-sanitizer-ppc64-musl.patch new file mode 100644 index 0000000000000..b6d385c1d1814 --- /dev/null +++ b/srcpkgs/llvm17/patches/compiler-rt-sanitizer-ppc64-musl.patch @@ -0,0 +1,37 @@ +--- a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp ++++ b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp +@@ -74,6 +74,10 @@ + #include + #endif + ++#if SANITIZER_LINUX && defined(__powerpc__) ++#include ++#endif ++ + #if SANITIZER_LINUX && !SANITIZER_ANDROID + #include + #endif +--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp ++++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp +@@ -94,7 +94,7 @@ + # include + # include + # if defined(__mips64) || defined(__aarch64__) || defined(__arm__) || \ +- defined(__hexagon__) || defined(__loongarch__) ||SANITIZER_RISCV64 ++ defined(__hexagon__) || defined(__powerpc__) || defined(__loongarch__) ||SANITIZER_RISCV64 + # include + # ifdef __arm__ + typedef struct user_fpregs elf_fpregset_t; +--- a/compiler-rt/lib/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cpp ++++ b/compiler-rt/lib/sanitizer_common/sanitizer_stoptheworld_linux_libcdep.cpp +@@ -31,7 +31,7 @@ + #include // for pid_t + #include // for iovec + #include // for NT_PRSTATUS +-#if (defined(__aarch64__) || SANITIZER_RISCV64 || SANITIZER_LOONGARCH64) && \ +- !SANITIZER_ANDROID ++#if (defined(__aarch64__) || defined(__powerpc__) ||SANITIZER_RISCV64 || SANITIZER_LOONGARCH64) && \ ++ !SANITIZER_ANDROID + // GLIBC 2.20+ sys/user does not include asm/ptrace.h + # include + #endif diff --git a/srcpkgs/llvm17/patches/compiler-rt-sanitizer-supported-arch.patch b/srcpkgs/llvm17/patches/compiler-rt-sanitizer-supported-arch.patch new file mode 100644 index 0000000000000..c9b9286ac37b3 --- /dev/null +++ b/srcpkgs/llvm17/patches/compiler-rt-sanitizer-supported-arch.patch @@ -0,0 +1,22 @@ +Based on patch from Alpine: +https://gitlab.alpinelinux.org/alpine/aports/-/blob/693203c42aa1cde88cb547173ef67a98824973fd/main/llvm-runtimes/compiler-rt-sanitizer-supported-arch.patch + +Sanitizer code is broken on armhf, armv7, s390x, x86, and probably riscv64 on musl, +i.e. enable it only on x86_64, aarch64, and ppc64le. + +--- a/compiler-rt/cmake/Modules/AllSupportedArchDefs.cmake ++++ b/compiler-rt/cmake/Modules/AllSupportedArchDefs.cmake +@@ -23,9 +23,13 @@ if(APPLE) + set(X86_64 x86_64 x86_64h) + endif() + ++if (LIBCXX_HAS_MUSL_LIBC) ++set(ALL_SANITIZER_COMMON_SUPPORTED_ARCH ${X86_64} ${ARM64} ${PPC64}) ++else() + set(ALL_SANITIZER_COMMON_SUPPORTED_ARCH ${X86} ${X86_64} ${PPC64} ${RISCV64} + ${ARM32} ${ARM64} ${MIPS32} ${MIPS64} ${S390X} ${SPARC} ${SPARCV9} + ${HEXAGON} ${LOONGARCH64}) ++endif() + set(ALL_ASAN_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM32} ${ARM64} ${RISCV64} + ${MIPS32} ${MIPS64} ${PPC64} ${S390X} ${SPARC} ${SPARCV9} ${HEXAGON} + ${LOONGARCH64}) diff --git a/srcpkgs/llvm17/patches/libcxx-armv67.patch b/srcpkgs/llvm17/patches/libcxx-armv67.patch new file mode 100644 index 0000000000000..700ab13479045 --- /dev/null +++ b/srcpkgs/llvm17/patches/libcxx-armv67.patch @@ -0,0 +1,35 @@ +See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=109180 +Avoid the following undefined reference: + +/usr/lib/gcc/armv7l-linux-gnueabihf/12.2.0/../../../../armv7l-linux-gnueabihf/bin/ld: projects/libcxx/src/CMakeFiles/cxx_shared.dir/locale.cpp.o: in function `std::__1::__time_get_c_storage::__x() const [clone .localalias]': +locale.cpp:(.text._ZNKSt3__120__time_get_c_storageIcE3__xEv+0xb4): undefined reference to `std::__1::basic_string, std::__1::allocator >::~basic_string()' +/usr/lib/gcc/armv7l-linux-gnueabihf/12.2.0/../../../../armv7l-linux-gnueabihf/bin/ld: projects/libcxx/src/CMakeFiles/cxx_shared.dir/locale.cpp.o: in function `std::__1::__time_get_c_storage::__X() const [clone .localalias]': + +diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt +index b8ac536588d3..65e5a1365634 100644 +--- a/libcxx/CMakeLists.txt ++++ b/libcxx/CMakeLists.txt +@@ -308,6 +308,8 @@ endif() + option(LIBCXX_HERMETIC_STATIC_LIBRARY + "Do not export any symbols from the static library." ${LIBCXX_HERMETIC_STATIC_LIBRARY_DEFAULT}) + ++option(LIBCXX_VOID_GCC_BUG_109180_WORKAROUND OFF) ++ + #=============================================================================== + # Check option configurations + #=============================================================================== +diff --git a/libcxx/src/CMakeLists.txt b/libcxx/src/CMakeLists.txt +index 35b466527096..5b0efa171616 100644 +--- a/libcxx/src/CMakeLists.txt ++++ b/libcxx/src/CMakeLists.txt +@@ -155,6 +155,10 @@ if (LIBCXX_GENERATE_COVERAGE AND NOT LIBCXX_COVERAGE_LIBRARY) + endif() + add_library_flags_if(LIBCXX_COVERAGE_LIBRARY "${LIBCXX_COVERAGE_LIBRARY}") + ++if (LIBCXX_VOID_GCC_BUG_109180_WORKAROUND) ++ set_source_files_properties(string.cpp PROPERTIES COMPILE_FLAGS -fno-inline) ++endif() ++ + if (APPLE AND LLVM_USE_SANITIZER) + if (("${LLVM_USE_SANITIZER}" STREQUAL "Address") OR + ("${LLVM_USE_SANITIZER}" STREQUAL "Address;Undefined") OR diff --git a/srcpkgs/llvm17/patches/libcxx-musl.patch b/srcpkgs/llvm17/patches/libcxx-musl.patch new file mode 100644 index 0000000000000..fb0ea3da4d057 --- /dev/null +++ b/srcpkgs/llvm17/patches/libcxx-musl.patch @@ -0,0 +1,27 @@ +--- a/libcxx/include/locale ++++ b/libcxx/include/locale +@@ -742,7 +742,11 @@ __num_get_signed_integral(const char* __a, const char* __a_end, + typename remove_reference::type __save_errno = errno; + errno = 0; + char *__p2; ++#if defined(__linux__) && !defined(__GLIBC__) ++ long long __ll = strtoll(__a, &__p2, __base); ++#else + long long __ll = strtoll_l(__a, &__p2, __base, _LIBCPP_GET_C_LOCALE); ++#endif + __libcpp_remove_reference_t __current_errno = errno; + typename remove_reference::type __current_errno = errno; + if (__current_errno == 0) + errno = __save_errno; +@@ -782,7 +786,11 @@ __num_get_unsigned_integral(const char* __a, const char* __a_end, + typename remove_reference::type __save_errno = errno; + errno = 0; + char *__p2; ++#if defined(__linux__) && !defined(__GLIBC__) ++ unsigned long long __ll = strtoull(__a, &__p2, __base); ++#else + unsigned long long __ll = strtoull_l(__a, &__p2, __base, _LIBCPP_GET_C_LOCALE); ++#endif + __libcpp_remove_reference_t __current_errno = errno; + if (__current_errno == 0) + errno = __save_errno; diff --git a/srcpkgs/llvm17/patches/libcxx-ssp-nonshared.patch b/srcpkgs/llvm17/patches/libcxx-ssp-nonshared.patch new file mode 100644 index 0000000000000..70292beb2fcdb --- /dev/null +++ b/srcpkgs/llvm17/patches/libcxx-ssp-nonshared.patch @@ -0,0 +1,11 @@ +--- a/libcxx/CMakeLists.txt ++++ b/libcxx/CMakeLists.txt +@@ -769,6 +769,8 @@ function(cxx_link_system_libraries target) + target_link_libraries(${target} PRIVATE atomic) + endif() + ++#ssp target_link_libraries(${target} PRIVATE ssp_nonshared) ++ + if (MINGW) + target_link_libraries(${target} PRIVATE "${MINGW_LIBRARIES}") + endif() diff --git a/srcpkgs/llvm17/patches/libcxxabi-dl.patch b/srcpkgs/llvm17/patches/libcxxabi-dl.patch new file mode 100644 index 0000000000000..3a15f9db8c981 --- /dev/null +++ b/srcpkgs/llvm17/patches/libcxxabi-dl.patch @@ -0,0 +1,25 @@ +Also link to -ldl to prevent undefined references. + +--- a/libcxxabi/src/CMakeLists.txt ++++ b/libcxxabi/src/CMakeLists.txt +@@ -73,6 +73,7 @@ + endif() + + add_library_flags_if(LIBCXXABI_HAS_C_LIB c) ++ add_library_flags_if(LIBCXXABI_HAS_C_LIB dl) + endif() + + if (LIBCXXABI_USE_LLVM_UNWINDER) +--- a/libcxx/CMakeLists.txt ++++ b/libcxx/CMakeLists.txt +@@ -745,6 +745,10 @@ + target_link_libraries(${target} PRIVATE m) + endif() + ++ if (LIBCXX_HAS_C_LIB) ++ target_link_libraries(${target} PRIVATE dl) ++ endif() ++ + if (LIBCXX_HAS_RT_LIB) + target_link_libraries(${target} PRIVATE rt) + endif() diff --git a/srcpkgs/llvm17/patches/libomp-soname.patch b/srcpkgs/llvm17/patches/libomp-soname.patch new file mode 100644 index 0000000000000..9a622cd9254c2 --- /dev/null +++ b/srcpkgs/llvm17/patches/libomp-soname.patch @@ -0,0 +1,12 @@ +diff --git a/openmp/runtime/src/CMakeLists.txt b/openmp/runtime/src/CMakeLists.txt +index df1ca9d90..9d2c3b7b9 100644 +--- a/openmp/runtime/src/CMakeLists.txt ++++ b/openmp/runtime/src/CMakeLists.txt +@@ -150,6 +150,7 @@ libomp_get_libflags(LIBOMP_CONFIGURED_LIBFLAGS) + # Build libomp library. Add LLVMSupport dependency if building in-tree with libomptarget profiling enabled. + if(OPENMP_STANDALONE_BUILD OR (NOT OPENMP_ENABLE_LIBOMP_PROFILING)) + add_library(omp ${LIBOMP_LIBRARY_KIND} ${LIBOMP_SOURCE_FILES}) ++ set_target_properties(omp PROPERTIES VERSION ${LIBOMP_VERSION_MAJOR} SOVERSION ${LIBOMP_VERSION_MAJOR}) + # Linking command will include libraries in LIBOMP_CONFIGURED_LIBFLAGS + target_link_libraries(omp ${LIBOMP_CONFIGURED_LIBFLAGS} ${LIBOMP_DL_LIBS}) + else() diff --git a/srcpkgs/llvm17/patches/llvm-001-musl.patch b/srcpkgs/llvm17/patches/llvm-001-musl.patch new file mode 100644 index 0000000000000..b6efd02a5698f --- /dev/null +++ b/srcpkgs/llvm17/patches/llvm-001-musl.patch @@ -0,0 +1,44 @@ +From faca3fbd15d0c3108493c3c54cd93138e049ac43 Mon Sep 17 00:00:00 2001 +From: Andrea Brancaleoni +Date: Tue, 8 Sep 2015 22:03:02 +0200 +Subject: [PATCH 3/3] musl + +--- + include/llvm/Analysis/TargetLibraryInfo.h | 9 +++++++++ + lib/Support/DynamicLibrary.cpp | 2 +- + lib/Support/Unix/Signals.inc | 6 +++--- + utils/unittest/googletest/src/gtest.cc | 1 + + 5 files changed, 17 insertions(+), 6 deletions(-) + +diff --git a/include/llvm/Analysis/TargetLibraryInfo.h b/include/llvm/Analysis/TargetLibraryInfo.h +index 34a8a1e3..1214ece5 100644 +--- a/llvm/include/llvm/Analysis/TargetLibraryInfo.h ++++ b/llvm/include/llvm/Analysis/TargetLibraryInfo.h +@@ -18,6 +18,15 @@ + #include "llvm/IR/PassManager.h" + #include "llvm/Pass.h" + ++#undef fopen64 ++#undef fseeko64 ++#undef fstat64 ++#undef fstatvfs64 ++#undef ftello64 ++#undef lstat64 ++#undef stat64 ++#undef tmpfile64 ++ + namespace llvm { + template class ArrayRef; + class Triple; +diff --git a/utils/unittest/googletest/src/gtest.cc b/utils/unittest/googletest/src/gtest.cc +index d882ab2e..f1fb12d0 100644 +--- a/third-party/unittest/googletest/src/gtest.cc ++++ b/third-party/unittest/googletest/src/gtest.cc +@@ -128,6 +128,7 @@ + + #if GTEST_CAN_STREAM_RESULTS_ + # include // NOLINT ++# include // NOLINT + # include // NOLINT + # include // NOLINT + # include // NOLINT diff --git a/srcpkgs/llvm17/patches/llvm-004-override-opt.patch b/srcpkgs/llvm17/patches/llvm-004-override-opt.patch new file mode 100644 index 0000000000000..51d0e4b31b32c --- /dev/null +++ b/srcpkgs/llvm17/patches/llvm-004-override-opt.patch @@ -0,0 +1,18 @@ +This allows us to override the optimization level as not all platforms can +deal with -O3. + +--- a/llvm/CMakeLists.txt ++++ b/llvm/CMakeLists.txt +@@ -918,6 +918,12 @@ if( MINGW AND NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" ) + llvm_replace_compiler_option(CMAKE_CXX_FLAGS_RELEASE "-O3" "-O2") + endif() + ++set(VOID_CXX_OPT_FLAGS "" CACHE STRING "Optimization level to use") ++ ++if (NOT VOID_CXX_OPT_FLAGS STREQUAL "") ++ llvm_replace_compiler_option(CMAKE_CXX_FLAGS_RELEASE "-O3" "${VOID_CXX_OPT_FLAGS}") ++endif() ++ + # Put this before tblgen. Else we have a circular dependence. + add_subdirectory(lib/Demangle) + add_subdirectory(lib/Support) diff --git a/srcpkgs/llvm17/patches/llvm-005-ppc-bigpic.patch b/srcpkgs/llvm17/patches/llvm-005-ppc-bigpic.patch new file mode 100644 index 0000000000000..d332687b9d929 --- /dev/null +++ b/srcpkgs/llvm17/patches/llvm-005-ppc-bigpic.patch @@ -0,0 +1,36 @@ +From f3dbdd49c06bfafc1d6138094cf42889c14d38b6 Mon Sep 17 00:00:00 2001 +From: Samuel Holland +Date: Sun, 3 Nov 2019 10:57:27 -0600 +Subject: [PATCH] [LLVM][PowerPC] Assume BigPIC if no PIC level is specified + +--- + llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp | 2 +- + llvm/lib/Target/PowerPC/PPCMCInstLower.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/Target/PowerPC/PPCAsmPrinter.cpp b/lib/Target/PowerPC/PPCAsmPrinter.cpp +index cce21f32..87ca5f9b 100644 +--- a/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp ++++ b/llvm/lib/Target/PowerPC/PPCAsmPrinter.cpp +@@ -520,7 +520,7 @@ void PPCAsmPrinter::EmitTlsCall(const MachineInstr *MI, + + // Add 32768 offset to the symbol so we follow up the latest GOT/PLT ABI. + if (Kind == MCSymbolRefExpr::VK_PLT && Subtarget->isSecurePlt() && +- M->getPICLevel() == PICLevel::BigPIC) ++ M->getPICLevel() != PICLevel::SmallPIC) + TlsRef = MCBinaryExpr::createAdd( + TlsRef, MCConstantExpr::create(32768, OutContext), OutContext); + const MachineOperand &MO = MI->getOperand(2); +diff --git a/lib/Target/PowerPC/PPCMCInstLower.cpp b/lib/Target/PowerPC/PPCMCInstLower.cpp +index 5cc180d7..a5b02565 100644 +--- a/llvm/lib/Target/PowerPC/PPCMCInstLower.cpp ++++ b/llvm/lib/Target/PowerPC/PPCMCInstLower.cpp +@@ -117,7 +117,7 @@ static MCOperand GetSymbolRef(const MachineOperand &MO, const MCSymbol *Symbol, + const MCExpr *Expr = MCSymbolRefExpr::create(Symbol, RefKind, Ctx); + // If -msecure-plt -fPIC, add 32768 to symbol. + if (Subtarget->isSecurePlt() && TM.isPositionIndependent() && +- M->getPICLevel() == PICLevel::BigPIC && ++ M->getPICLevel() != PICLevel::SmallPIC && + MO.getTargetFlags() == PPCII::MO_PLT) + Expr = + MCBinaryExpr::createAdd(Expr, MCConstantExpr::create(32768, Ctx), Ctx); diff --git a/srcpkgs/llvm17/patches/llvm-006-aarch64-mf_exec.patch b/srcpkgs/llvm17/patches/llvm-006-aarch64-mf_exec.patch new file mode 100644 index 0000000000000..192b4824b8695 --- /dev/null +++ b/srcpkgs/llvm17/patches/llvm-006-aarch64-mf_exec.patch @@ -0,0 +1,24 @@ +Fix failures in AllocationTests/MappedMemoryTest.* on aarch64: + + Failing Tests (8): + LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.AllocAndRelease/3 + LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.DuplicateNear/3 + LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.EnabledWrite/3 + LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.MultipleAllocAndRelease/3 + LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.SuccessiveNear/3 + LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.UnalignedNear/3 + LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.ZeroNear/3 + LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.ZeroSizeNear/3 + +Upstream-Issue: https://bugs.llvm.org/show_bug.cgi?id=14278#c10 + +--- a/llvm/lib/Support/Unix/Memory.inc ++++ b/llvm/lib/Support/Unix/Memory.inc +@@ -58,7 +58,7 @@ static int getPosixProtectionFlags(unsigned Flags) { + return PROT_READ | PROT_WRITE | PROT_EXEC; + case llvm::sys::Memory::MF_EXEC: +-#if defined(__FreeBSD__) || defined(__powerpc__) ++#if defined(__FreeBSD__) || defined(__powerpc__) || (defined(__linux__) && defined(__aarch64__)) + // On PowerPC, having an executable page that has no read permission + // can have unintended consequences. The function InvalidateInstruction- + // Cache uses instructions dcbf and icbi, both of which are treated by diff --git a/srcpkgs/llvm17/template b/srcpkgs/llvm17/template new file mode 100644 index 0000000000000..7bc22ec50272e --- /dev/null +++ b/srcpkgs/llvm17/template @@ -0,0 +1,668 @@ +# Template file for 'llvm17' +pkgname=llvm17 +version=17.0.6 +revision=1 +build_wrksrc=llvm +build_style=cmake +_ext_suffix=".cpython-${py3_ver/./}-linux-${XBPS_TARGET_LIBC/glibc/gnu}.so" +pycompile_dirs="usr/share/scan-view" +configure_args=" + -DCMAKE_BUILD_TYPE=Release -Wno-dev + -DENABLE_LINKER_BUILD_ID=YES + -DLLDB_USE_SYSTEM_SIX=YES + -DLIBCXX_CXX_ABI=libcxxabi + -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=YES + -DLIBCXXABI_USE_LLVM_UNWINDER=YES + -DLIBCXXABI_ENABLE_STATIC_UNWINDER=YES + -DLIBOMP_ENABLE_SHARED=YES + -DLIBOMP_INSTALL_ALIASES=NO + -DLLVM_INCLUDE_DOCS=YES + -DLLVM_BUILD_DOCS=YES + -DLLVM_ENABLE_SPHINX=YES + -DSPHINX_WARNINGS_AS_ERRORS=NO + -DLLVM_INSTALL_UTILS=YES + -DLLVM_BUILD_LLVM_DYLIB=YES + -DLLVM_LINK_LLVM_DYLIB=YES + -DCLANG_LINK_CLANG_DYLIB=YES + -DLLVM_ENABLE_RTTI=YES + -DLLVM_ENABLE_FFI=YES + -DLLVM_ENABLE_RUNTIMES=all + -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 git python3-sphinx-markdown-tables python3-yaml pkg-config " +makedepends="python3-devel zlib-devel elfutils-devel libffi-devel libedit-devel + libxml2-devel binutils-devel " +depends="libllvm17>=${version}_${revision}" +short_desc="LLVM Compiler Infrastructure Project - Version 17" +maintainer="Daniel Martinez " +license="Apache-2.0" +homepage="https://www.llvm.org" +distfiles="https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/llvm-project-${version}.src.tar.xz" +checksum=58a8818c60e6627064f312dbf46c02d9949956558340938b71cf731ad8bc0813 +lib32disabled=yes +python_version=3 + +build_options="clang clang_tools_extra lld mlir libclc polly lldb flang bolt openmp" +build_options_default="clang clang_tools_extra lld mlir libclc polly lldb" + +case "$XBPS_TARGET_MACHINE" in + x86_64*|aarch64*) build_options_default+=" flang bolt openmp ";; +esac + +if [ "$XBPS_CCACHE" ]; then + configure_args+=" -DLLVM_CCACHE_BUILD=YES " +fi + +if [ "$XBPS_TARGET_LIBC" = "musl" ]; then + configure_args+=" -DLIBCXX_HAS_MUSL_LIBC=YES + -DCOMPILER_RT_BUILD_GWP_ASAN=OFF" +fi + +if [ "$build_option_clang" ]; then + _enabled_projects+="clang;" + subpackages+=" clang17 clang17-devel libclang17 libclang-cpp17 clang-analyzer17 " +fi +if [ "$build_option_clang_tools_extra" ]; then + _enabled_projects+="clang-tools-extra;" + subpackages+=" clang-tools-extra17 " +fi +if [ "$build_option_bolt" ]; then + _enabled_projects+="bolt;" + subpackages+=" llvm-bolt17 " +fi +if [ "$build_option_polly" ]; then + _enabled_projects+="polly;" +fi +if [ "$build_option_lldb" ]; then + _enabled_projects+="lldb;" + subpackages+=" lldb17 lldb17-devel " +fi +if [ "$build_option_lld" ]; then + _enabled_projects+="lld;" + subpackages+=" lld17 lld17-devel " +fi +if [ "$build_option_libclc" ]; then + _enabled_projects+="libclc;" +fi +if [ "$build_option_mlir" ]; then + _enabled_projects+="mlir;" + subpackages+=" mlir17 mlir17-devel " +fi +if [ "$build_option_flang" ]; then + _enabled_projects+="flang;" + subpackages+=" flang17 flang17-devel " +fi +if [ "$build_option_openmp" ]; then + _enabled_projects+="openmp;" + subpackages+=" libomp libomp-devel " +fi +subpackages+=" llvm-libunwind llvm-libunwind-devel libcxx libcxx-devel libcxxabi libcxxabi-devel libllvm17 llvm17-doc llvm17-devel " + +configure_args+=" -DLLVM_ENABLE_PROJECTS=${_enabled_projects}" + +if [ "$CROSS_BUILD" ]; then + # Seems to require a full host llvm/clang build + configure_args+=" -DLIBOMPTARGET_BUILD_CUDA_PLUGIN=OFF" + configure_args+=" -DLIBOMPTARGET_BUILD_AMDGPU_PLUGIN=OFF" +fi + + +# For OCaml bindings and lldb lua scripting +if [ -z "$CROSS_BUILD" ]; then + # OCaml cross build is broken + hostmakedepends+=" ocaml ocaml-findlib " + # lldb cross build fails with lua + makedepends+=" lua53-devel " +fi + +post_patch() { + if [ "$build_option_lldb" ]; then + if [ "$XBPS_TARGET_LIBC" = "musl" ]; then + vsed -i 's|__ptrace_request|int|g' \ + ${wrksrc}/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp + fi + # disable docs for lldb as they fail to generate + vsed -i '/add_subdirectory(docs)/d' \ + ${wrksrc}/lldb/CMakeLists.txt + fi + + # update config.guess for better platform detection + cp $XBPS_COMMONDIR/environment/configure/automake/config.guess \ + ${wrksrc}/llvm/cmake + + # fix linker failures on some archs + vsed -i 's,check_library_exists(gcc_s .*,set(LIBCXXABI_HAS_GCC_S_LIB ON),' \ + ${wrksrc}/libcxxabi/cmake/config-ix.cmake + vsed -i 's,check_library_exists(gcc .*,set(LIBCXXABI_HAS_GCC_LIB ON),' \ + ${wrksrc}/libcxxabi/cmake/config-ix.cmake + + # need libssp_nonshared on some musl platforms (because of nodefaultlibs) + case "$XBPS_TARGET_MACHINE" in + ppc64*) ;; + ppc*-musl|i686-musl|mips*-musl) + vsed -i 's,^# Setup flags.$,add_library_flags(ssp_nonshared),' \ + ${wrksrc}/libunwind/src/CMakeLists.txt + vsed -i 's,^# Setup flags.$,add_library_flags(ssp_nonshared),' \ + ${wrksrc}/libcxxabi/src/CMakeLists.txt + vsed -i 's,#ssp,,' ${wrksrc}/libcxx/CMakeLists.txt + ;; + esac +} + +pre_configure() { + local triplet + + # Vastly reduce size of debugging symbols: + CFLAGS=${CFLAGS/ -g/ -g1} + CXXFLAGS=${CXXFLAGS/ -g/ -g1} + + # since gcc9, the build likes to blow up for ppc32 apparently because + # of clang being too large for a 24-bit relative call to the PLT, so + # optimize for size instead + case "$XBPS_TARGET_MACHINE" in + ppc64*) ;; + mips*-musl|ppc*) configure_args+=" -DVOID_CXX_OPT_FLAGS=-Os" ;; + armv*) configure_args+=" -DLIBCXX_VOID_GCC_BUG_109180_WORKAROUND=ON ";; + esac + + if [ "$CROSS_BUILD" ]; then + msg_normal "Building host tblgen\n" + mkdir -p build/HOST + cd build/HOST + CC="$BUILD_CC" CXX="$BUILD_CXX" CFLAGS="$BUILD_CFLAGS" \ + CXXFLAGS="$BUILD_CXXFLAGS" LDFLAGS="$BUILD_LDFLAGS" \ + cmake ../.. -DCMAKE_BUILD_TYPE=Release \ + -DLLVM_ENABLE_PROJECTS=${_enabled_projects} + + make ${makejobs} -C utils/TableGen + configure_args+=" -DLLVM_TABLEGEN=${wrksrc}/llvm/build/HOST/bin/llvm-tblgen" + + make ${makejobs} -C tools/clang/utils/TableGen + configure_args+=" -DCLANG_TABLEGEN=${wrksrc}/llvm/build/HOST/bin/clang-tblgen" + + make ${makejobs} -C tools/mlir/tools/mlir-pdll + configure_args+=" -DMLIR_TABLEGEN=${wrksrc}/llvm/build/HOST/bin/mlir-tblgen" + configure_args+=" -DMLIR_PDLL_TABLEGEN=${wrksrc}/llvm/build/HOST/bin/mlir-pdll" + configure_args+=" -DMLIR_LINALG_ODS_YAML_GEN=${wrksrc}/llvm/build/HOST/bin/mlir-linalg-ods-yaml-gen" + + make ${makejobs} -C tools/clang/tools/extra/clang-tidy/misc/ConfusableTable + configure_args+=" -DCLANG_TIDY_CONFUSABLE_CHARS_GEN=${wrksrc}/llvm/build/HOST/bin/clang-tidy-confusable-chars-gen" + make ${makejobs} -C tools/clang/tools/extra/pseudo/gen + configure_args+=" -DCLANG_PSEUDO_GEN=${wrksrc}/llvm/build/HOST/bin/clang-pseudo-gen" + + make ${makejobs} -C tools/llvm-config + configure_args+=" -DLLVM_CONFIG_PATH=${wrksrc}/llvm/build/HOST/bin/llvm-config" + + make ${makejobs} -C tools/lldb/utils/TableGen lldb-tblgen + configure_args+=" -DLLDB_TABLEGEN_EXE=${wrksrc}/llvm/build/HOST/bin/lldb-tblgen" + + cd ../.. + fi + + case "$XBPS_TARGET_MACHINE" in + arm*-musl|i686-musl) + # sanitizer code is broken since it duplicates some libc bits + configure_args+=" -DCOMPILER_RT_BUILD_SANITIZERS=OFF" + ;; + esac + + case "$XBPS_TARGET_MACHINE" in + i686*) _arch="X86";; + x86_64*) _arch="X86";; + armv5*) _arch="Armv5te";; + armv6*) _arch="Armv6";; + armv7*) _arch="Armv7";; + aarch64*) _arch="AArch64";; + mips*) _arch="Mips";; + ppc*) _arch="PowerPC";; + riscv64*) _arch="RISCV64";; + esac + + triplet=${XBPS_CROSS_TRIPLET:-$XBPS_TRIPLET} + + configure_args+=" -DLLVM_TARGET_ARCH=${_arch}" + configure_args+=" -DLLVM_HOST_TRIPLE=${triplet}" + configure_args+=" -DLLVM_DEFAULT_TARGET_TRIPLE=${triplet}" +} + +post_build() { + + mkdir -p ${wrksrc}/${build_wrksrc}/runtimes-doc + cmake -G Ninja ${wrksrc}/runtimes -B ${wrksrc}/${build_wrksrc}/runtimes-doc \ + -DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi;libunwind" \ + -DLLVM_ENABLE_SPHINX=ON \ + -DSPHINX_WARNINGS_AS_ERRORS=OFF + + ninja ${makejobs} -C ${wrksrc}/${build_wrksrc}/runtimes-doc docs-libcxx-html docs-libunwind-html +} + +post_install() { + + # Required for multilib. + if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then + for _header in llvm-config; do + mv ${DESTDIR}/usr/include/llvm/Config/${_header}{,-64}.h + vinstall ${FILESDIR}/llvm-Config-${_header}.h 644 \ + usr/include/llvm/Config ${_header}.h + done + fi + + # Remove llvm-config-host in cross builds. + if [ "$CROSS_BUILD" ]; then + rm -f ${DESTDIR}/usr/bin/llvm-config-host + fi + + rm -rf ${DESTDIR}/usr/share/gdb + + # Install libcxxabi headers + vinstall ${wrksrc}/libcxxabi/include/__cxxabi_config.h 644 usr/include + vinstall ${wrksrc}/libcxxabi/include/cxxabi.h 644 usr/include + + # Install libunwind headers + vinstall ${wrksrc}/libunwind/include/__libunwind_config.h 644 usr/include + vinstall ${wrksrc}/libunwind/include/libunwind.h 644 usr/include + vinstall ${wrksrc}/libunwind/include/unwind.h 644 usr/include + vinstall ${wrksrc}/libunwind/include/mach-o/compact_unwind_encoding.h \ + 644 usr/include/mach-o + + # Install libcxx and libunwind docs + cmake -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr -P ${wrksrc}/${build_wrksrc}/runtimes-doc/libcxx/docs/cmake_install.cmake + cmake -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr -P ${wrksrc}/${build_wrksrc}/runtimes-doc/libunwind/docs/cmake_install.cmake + + # Can this be disabled some other way? + rm -rf ${DESTDIR}/usr/lib64 +} + +clang17_package() { + lib32disabled=yes + depends="libstdc++-devel libgcc-devel binutils ${XBPS_TARGET_LIBC}-devel + libclang17-${version}_${revision} " + short_desc+=" - C language family frontend" + homepage="https://clang.llvm.org/" + pkg_install() { + vmove usr/bin/clang-17 + vmove usr/bin/clang + vmove usr/bin/clang++ + vmove usr/bin/clang-cl + vmove usr/bin/clang-cpp + vmove usr/bin/clang-check + vmove usr/bin/clang-extdef-mapping + vmove usr/bin/clang-format + vmove usr/bin/clang-linker-wrapper + vmove usr/bin/clang-offload-bundler + vmove usr/bin/clang-offload-packager + vmove usr/bin/clang-refactor + vmove usr/bin/clang-rename + vmove usr/bin/clang-repl + vmove usr/bin/clang-scan-deps + vmove usr/bin/clang-tblgen + vmove usr/bin/c-index-test + vmove usr/bin/diagtool + vmove usr/bin/amdgpu-arch + vmove usr/bin/nvptx-arch + vmove usr/share/man/man1/clang.1 + vmove usr/share/man/man1/diagtool.1 + if [ "$build_option_polly" ]; then + vmove usr/lib/LLVMPolly.so + vmove usr/share/man/man1/polly.1 + fi + } +} + +clang17-devel_package() { + lib32disabled=yes + depends="libstdc++-devel libgcc-devel binutils ${XBPS_TARGET_LIBC}-devel + libclang17-${version}_${revision}" + short_desc+=" - C language family frontend - development Files" + homepage="https://clang.llvm.org/" + pkg_install() { + vmove usr/include/clang + vmove usr/include/clang-c + vmove usr/lib/clang + vmove usr/lib/libear + vmove usr/lib/cmake/clang + vmove "usr/lib/libclang*.a" + vmove "usr/lib/libclang*.so" + vmove usr/share/clang + vmove usr/bin/hmaptool + vmove usr/bin/git-clang-format + if [ "$build_option_clang_tools_extra" ]; then + vmove usr/include/clang-tidy + vmove usr/lib/libfindAllSymbols.a + fi + if [ "$build_option_polly" ]; then + vmove usr/include/polly + vmove usr/lib/cmake/polly + vmove "usr/lib/libPolly*.a" + fi + } +} + +libclang17_package() { + short_desc+=" - C frontend runtime library" + pkg_install() { + vmove "usr/lib/libclang.so.*" + } +} + +libclang-cpp17_package() { + short_desc+=" - C frontend runtime library (C++ interface)" + pkg_install() { + vmove "usr/lib/libclang-cpp.so.*" + } +} + +clang-analyzer17_package() { + depends="clang17-${version}_${revision} python3 perl" + short_desc+=" - A source code analysis framework" + homepage="https://clang-analyzer.llvm.org/" + pkg_install() { + vmove usr/share/scan-view + vmove usr/share/scan-build + vmove usr/lib/libscanbuild + vmove usr/libexec/analyze-c++ + vmove usr/libexec/analyze-cc + vmove usr/libexec/intercept-c++ + vmove usr/libexec/intercept-cc + vmove usr/libexec/c++-analyzer + vmove usr/libexec/ccc-analyzer + vmove usr/share/man/man1/scan-build.1 + vmove usr/bin/analyze-build + vmove usr/bin/scan-build + vmove usr/bin/scan-build-py + vmove usr/bin/scan-view + } +} + +clang-tools-extra17_package() { + lib32disabled=yes + depends="clang17-${version}_${revision} python3" + short_desc+=" - Extra Clang tools" + homepage="https://clang.llvm.org/extra/" + pkg_install() { + vmove usr/bin/clang-apply-replacements + vmove usr/bin/clang-change-namespace + vmove usr/bin/clang-doc + vmove usr/bin/clang-include-cleaner + vmove usr/bin/clang-include-fixer + vmove usr/bin/clang-move + vmove usr/bin/clang-pseudo + vmove usr/bin/clang-query + vmove usr/bin/clang-reorder-fields + vmove usr/bin/clang-tidy + vmove usr/bin/clangd + vmove usr/bin/find-all-symbols + vmove usr/bin/modularize + vmove usr/bin/pp-trace + vmove usr/bin/run-clang-tidy + vmove usr/share/man/man1/extraclangtools.1 + } +} + +# "bolt" package name is already used +llvm-bolt17_package() { + lib32disabled=yes + short_desc+=" - post-link optimizer" + homepage="https://github.com/llvm/llvm-project/tree/main/bolt" + depends="clang17>=${version}_${revision}" + pkg_install() { + vmove usr/bin/llvm-bolt + vmove usr/bin/perf2bolt + vmove usr/bin/llvm-boltdiff + vmove usr/bin/merge-fdata + vmove usr/bin/llvm-bolt-heatmap + case "$XBPS_TARGET_MACHINE" in + x86_64*) vmove usr/lib/libbolt_rt_instr.a + vmove usr/lib/libbolt_rt_hugify.a + ;; + esac + } +} + +lldb17_package() { + lib32disabled=yes + depends+=" python3-six" + short_desc+=" - LLDB debugger" + homepage="https://lldb.llvm.org/" + pkg_install() { + vmove usr/bin/lldb + vmove usr/bin/lldb-argdumper + vmove usr/bin/lldb-instr + vmove usr/bin/lldb-server + vmove usr/bin/lldb-vscode + vmove "usr/lib/liblldb*.so.*" + vmove "usr/lib/python${py3_ver}/site-packages/lldb" + if [ -z "$CROSS_BUILD" ]; then + vmove /usr/lib/lua/5.3/lldb.so + fi + } +} + +lldb17-devel_package() { + lib32disabled=yes + depends="lldb17>=${version}_${revision}" + short_desc+=" - LLDB debugger - development files" + pkg_install() { + vmove usr/include/lldb + vmove "usr/lib/liblldb*.so" + } +} + +lld17_package() { + lib32disabled=yes + short_desc+=" - linker" + homepage="https://lld.llvm.org" + pkg_install() { + vmove usr/bin/lld + vmove usr/bin/lld-link + vmove usr/bin/ld.lld + vmove usr/bin/ld64.lld + vmove usr/bin/wasm-ld + } +} + +lld17-devel_package() { + lib32disabled=yes + short_desc+=" - linker - development files" + homepage="https://lld.llvm.org" + depends="lld17>=${version}_${revision}" + pkg_install() { + vmove usr/include/lld + vmove usr/lib/cmake/lld + vmove "usr/lib/liblld*.a" + } +} + +mlir17_package() { + lib32disabled=yes + short_desc+=" - multi-level IR compiler framework" + homepage="https://mlir.llvm.org/" + pkg_install() { + vmove "usr/lib/libMLIR*.so.*" + vmove "usr/lib/libmlir*.so.*" + } +} + +mlir17-devel_package() { + lib32disabled=yes + short_desc+=" - multi-level IR compiler framework - development files" + homepage="https://mlir.llvm.org/" + pkg_install() { + vmove usr/bin/mlir-cpu-runner + vmove usr/bin/mlir-linalg-ods-yaml-gen + vmove usr/bin/mlir-lsp-server + vmove usr/bin/mlir-opt + vmove usr/bin/mlir-pdll + vmove usr/bin/mlir-pdll-lsp-server + vmove usr/bin/mlir-reduce + vmove usr/bin/mlir-tblgen + vmove usr/bin/mlir-translate + vmove usr/bin/tblgen-lsp-server + vmove usr/include/mlir + vmove usr/include/mlir-c + vmove usr/lib/cmake/mlir + vmove "usr/lib/libMLIR*" + vmove "usr/lib/objects-Release/obj.MLIR*" + vmove "usr/lib/libmlir*" + vmove usr/share/man/man1/mlir-tblgen.1 + } +} + +flang17_package() { + lib32disabled=yes + short_desc+=" - Fortran language frontend" + homepage="https://flang.llvm.org/" + depends="mlir17>=${version}_${revision}" + pkg_install() { + vmove usr/bin/flang-new + vmove usr/bin/flang-to-external-fc + } +} + +flang17-devel_package() { + lib32disabled=yes + short_desc+=" - Fortran language frontend - development files" + homepage="https://flang.llvm.org/" + depends="flang17>=${version}_${revision}" + pkg_install() { + vmove usr/bin/bbc + vmove usr/bin/f18-parse-demo + vmove usr/bin/fir-opt + vmove usr/bin/tco + vmove usr/include/flang + vmove usr/lib/cmake/flang + vmove "usr/lib/libflang*.a" + vmove "usr/lib/libFIR*.a" + vmove "usr/lib/libHLFIR*.a" + vmove "usr/lib/libFortran*.a" + } +} + +libomp_package() { + short_desc+=" - Clang OpenMP support library" + pkg_install() { + vmove "usr/lib/libomp*.so.*" + } +} + +libomp-devel_package() { + short_desc+=" - Clang OpenMP support library - development files" + depends="libomp>=${version}_${revision}" + pkg_install() { + vmove usr/bin/llvm-omp-device-info + vmove usr/bin/llvm-omp-kernel-replay + vmove "usr/lib/libarcher*.so" + vmove "usr/lib/libomp*.so" + vmove usr/lib/cmake/openmp + vmove usr/share/man/man1/llvmopenmp.1 + if [ -z "$CROSS_BUILD" ]; then + vmove "usr/lib/libomptarget*.bc" + vmove "usr/lib/libarcher*.a" + vmove "usr/lib/libomp*.a" + fi + } +} + +llvm-libunwind_package() { + short_desc+=" - libunwind" + pkg_install() { + vmove "usr/lib/libunwind.so.*" + } +} + +llvm-libunwind-devel_package() { + short_desc+=" - libunwind - development files" + depends="llvm-libunwind>=${version}_${revision}" + conflicts="libunwind-devel>=0" + pkg_install() { + vmove usr/include/mach-o + vmove "usr/include/*unwind*" + vmove "usr/lib/libunwind.a" + vmove "usr/lib/libunwind.so" + + LIBUNWIND_DOCS=usr/share/doc/LLVM/libunwind + vmkdir ${LIBUNWIND_DOCS} + vcopy ${wrksrc}/${build_wrksrc}/runtimes-doc/libunwind/docs/html ${LIBUNWIND_DOCS} + } +} + +libcxxabi_package() { + short_desc+=" - low level support for libc++" + pkg_install() { + vmove "usr/lib/libc++abi.so.*" + } +} + +libcxxabi-devel_package() { + short_desc+=" - low level support for libc++ - development files" + depends="libcxxabi>=${version}_${revision}" + pkg_install() { + vmove "usr/include/*cxxabi*" + vmove "usr/lib/libc++abi.so" + vmove "usr/lib/libc++abi.a" + } +} + +libcxx_package() { + short_desc+=" - C++ standard library" + pkg_install() { + vmove "usr/lib/libc++.so.*" + } +} + +libcxx-devel_package() { + short_desc+=" - C++ standard library - development files" + depends="libcxx>=${version}_${revision}" + pkg_install() { + vmove usr/include/c++ + vmove "usr/lib/libc++.so" + vmove "usr/lib/libc++.a" + vmove "usr/lib/libc++experimental.a" + + LIBCXX_DOCS=usr/share/doc/LLVM/libcxx + vmkdir ${LIBCXX_DOCS} + vcopy ${wrksrc}/${build_wrksrc}/runtimes-doc/libcxx/docs/html ${LIBCXX_DOCS} + } +} + +libllvm17_package() { + short_desc+=" - runtime library" + pkg_install() { + vmove "usr/lib/libLLVM-*.so*" + } +} + +llvm17-doc_package() { + short_desc+=" - documentation " + pkg_install() { + vmove usr/share/doc + } +} + +llvm17-devel_package() { + short_desc+=" - development files" + depends="llvm17>=${version}_${revision}" + if [ "$build_option_openmp" ]; then + depends+=" libomp-devel>={$version}_${revision} " + fi + if [ "$build_option_mlir" ]; then + depends+=" mlir17-devel>={$version}_${revision} " + fi + if [ "$build_option_clang" ]; then + depends+=" clang17-devel>={$version}_${revision} " + fi + pkg_install() { + vmove usr/lib/libLLVM.so + vmove usr/lib/libLTO.so + vmove usr/lib/libRemarks.so + vmove usr/include/llvm + vmove usr/include/llvm-c + vmove "usr/lib/libLLVM*.a" + vmove usr/lib/cmake/llvm + + } +} diff --git a/srcpkgs/llvm17/update b/srcpkgs/llvm17/update new file mode 100644 index 0000000000000..e95cf26b3586b --- /dev/null +++ b/srcpkgs/llvm17/update @@ -0,0 +1,3 @@ +site="https://github.com/llvm/llvm-project/releases" +pattern="llvmorg-\K(\d+.){2}\d+(-rc\d+)?" +ignore="*-rc*" diff --git a/srcpkgs/mlir17 b/srcpkgs/mlir17 new file mode 120000 index 0000000000000..96970d5c02c13 --- /dev/null +++ b/srcpkgs/mlir17 @@ -0,0 +1 @@ +llvm17 \ No newline at end of file diff --git a/srcpkgs/mlir17-devel b/srcpkgs/mlir17-devel new file mode 120000 index 0000000000000..96970d5c02c13 --- /dev/null +++ b/srcpkgs/mlir17-devel @@ -0,0 +1 @@ +llvm17 \ No newline at end of file diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index 94feb99c0a862..2fca099c3ad31 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -1,6 +1,6 @@ # Template file for 'removed-packages' pkgname=removed-packages -version=0.1.20240105 +version=0.1.20240201 revision=1 build_style=meta short_desc="Uninstalls packages removed from repository" @@ -721,6 +721,9 @@ replaces=" zou<=0.2.0_7 zuluplay-devel<=1.1_1 zuluplay<=1.1_1 + lldb-devel<=15.0.7_3 + lld-devel<=15.0.7_3 + llvm-libunwind-devel<=15.0.7_3 " if [ "$XBPS_TARGET_LIBC" = "musl" ]; then From f5a00e48eedbbacdb563a16fc9707b243b0d9550 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 Nov 2023 11:07:35 -0400 Subject: [PATCH 02/30] CastXML: update to 0.6.2. --- srcpkgs/CastXML/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/CastXML/template b/srcpkgs/CastXML/template index de0920900ae4c..d8cb7aaaf8cf3 100644 --- a/srcpkgs/CastXML/template +++ b/srcpkgs/CastXML/template @@ -1,11 +1,11 @@ # Template file for 'CastXML' pkgname=CastXML -version=0.5.1 -revision=2 +version=0.6.2 +revision=1 build_style=cmake configure_args="-DSPHINX_MAN=YES -DCastXML_INSTALL_MAN_DIR=share/man" hostmakedepends="clang python3-Sphinx" -makedepends="clang-tools-extra llvm" +makedepends="clang-tools-extra llvm17-devel" depends="clang" checkdepends="libxml2" short_desc="C-family abstract syntax tree XML output tool" @@ -13,7 +13,7 @@ maintainer="Evgeny Ermakov " license="Apache-2.0" homepage="https://github.com/CastXML/CastXML" distfiles="https://github.com/CastXML/CastXML/archive/refs/tags/v${version}.tar.gz" -checksum=a7b40b1530585672f9cf5d7a6b6dd29f20c06cd5edf34ef34c89a184a4d1a006 +checksum=9bb108de1b3348a257be5b08a9f8418f89fdcd4af2e6ee271d68b0203ac75d5e post_install() { rm -r ${DESTDIR}/usr/share/castxml/clang/include From 69b71ad3b47c4ac15a5f90d892bec6761a5701f0 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 Nov 2023 11:07:50 -0400 Subject: [PATCH 03/30] bpftrace: rebuild for llvm17 --- srcpkgs/bpftrace/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template index 6b2d4ac25fc07..bbd738df63d57 100644 --- a/srcpkgs/bpftrace/template +++ b/srcpkgs/bpftrace/template @@ -1,12 +1,12 @@ # Template file for 'bpftrace' pkgname=bpftrace version=0.20.0 -revision=1 +revision=2 archs="x86_64* aarch64* ppc64*" build_style=cmake configure_args="-DUSE_SYSTEM_BPF_BCC=ON -DBUILD_TESTING=OFF" # needs root to run hostmakedepends="flex pkg-config ruby-asciidoctor" -makedepends="bcc-devel cereal clang clang-tools-extra elfutils-devel libbpf-devel libxml2-devel llvm" +makedepends="bcc-devel cereal clang clang-tools-extra elfutils-devel libbpf-devel libxml2-devel llvm17-devel" short_desc="High-level tracing language for Linux enhanced Berkeley Packet Filter" maintainer="Leah Neukirchen " license="Apache-2.0" From 510fef88b7aeec32fc8e80ba2fc8024f62e93ae9 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 Nov 2023 11:28:31 -0400 Subject: [PATCH 04/30] SPIRV-Tools: rebuild for llvm17 --- srcpkgs/SPIRV-Tools/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/SPIRV-Tools/template b/srcpkgs/SPIRV-Tools/template index 09a96c61ca504..5aba11a4a431f 100644 --- a/srcpkgs/SPIRV-Tools/template +++ b/srcpkgs/SPIRV-Tools/template @@ -1,6 +1,6 @@ # Template file for 'SPIRV-Tools' pkgname=SPIRV-Tools -version=2022.4 +version=2023.5 revision=1 build_style=cmake configure_args="-DSPIRV_SKIP_TESTS=ON -DSPIRV_WERROR=OFF @@ -12,8 +12,8 @@ maintainer="Orphaned " license="Apache-2.0" homepage="https://github.com/KhronosGroup/SPIRV-Tools" changelog="https://raw.githubusercontent.com/KhronosGroup/SPIRV-Tools/master/CHANGES" -distfiles="https://github.com/KhronosGroup/SPIRV-Tools/archive/v${version}.tar.gz" -checksum=a156215a2d7c6c5b267933ed691877a9a66f07d75970da33ce9ad627a71389d7 +distfiles="https://api.github.com/repos/KhronosGroup/SPIRV-Tools/tarball/vulkan-sdk-1.3.268.0>${version}.tar.gz" +checksum=eb560857e21876561e9e738ae8c9d6f42038366f90b2564be067cf020627e722 LDFLAGS="-Wl,--no-undefined" SPIRV-Tools-devel_package() { From 82fc756ffc0b6bd549cae9b542d627f6c1e93662 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 Nov 2023 11:50:16 -0400 Subject: [PATCH 05/30] SPIRV-LLVM-Translator: update to 17.0.0. --- srcpkgs/SPIRV-LLVM-Translator/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/SPIRV-LLVM-Translator/template b/srcpkgs/SPIRV-LLVM-Translator/template index bee99f9bcbb26..6f1cf2bd6e484 100644 --- a/srcpkgs/SPIRV-LLVM-Translator/template +++ b/srcpkgs/SPIRV-LLVM-Translator/template @@ -1,6 +1,6 @@ # Template file for 'SPIRV-LLVM-Translator' pkgname=SPIRV-LLVM-Translator -version=15.0.0 +version=17.0.0 revision=1 build_style=cmake make_build_args="llvm-spirv" @@ -8,13 +8,13 @@ configure_args="-Wno-dev -DLLVM_LINK_LLVM_DYLIB=ON -DCMAKE_SKIP_RPATH=ON -DLLVM_SPIRV_INCLUDE_TESTS=OFF -DBUILD_SHARED_LIBS=ON -DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=/usr" hostmakedepends="clang llvm" -makedepends="clang-tools-extra llvm SPIRV-Headers" +makedepends="clang-tools-extra llvm17-devel SPIRV-Headers" short_desc="API and commands for processing SPIR-V modules" maintainer="Orphaned " license="NCSA" homepage="https://github.com/KhronosGroup/SPIRV-LLVM-Translator" distfiles="https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/refs/tags/v${version}.tar.gz" -checksum=b1bebd77f72988758c00852e78c2ddc545815a612169a0cb377d021e2f846d88 +checksum=eba381e1dd99b4ff6c672a28f52755d1adf2d810a97b51e6074ad4fa67937fb2 post_install() { vlicense LICENSE.TXT From 7c88cd6d560200bdcccb0f9775443640ef3e0074 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 Nov 2023 11:50:23 -0400 Subject: [PATCH 06/30] SPIRV-Headers: update to 1.3.268.0. --- srcpkgs/SPIRV-Headers/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/SPIRV-Headers/template b/srcpkgs/SPIRV-Headers/template index 2457d5411aebe..6527729b3980b 100644 --- a/srcpkgs/SPIRV-Headers/template +++ b/srcpkgs/SPIRV-Headers/template @@ -1,15 +1,15 @@ # Template file for 'SPIRV-Headers' pkgname=SPIRV-Headers reverts="1.5.4.raytracing.fixed_1 1.5.3_2 1.5.3_1 1.5.1_1 1.4.1_1" -version=1.3.231.1 +version=1.3.268.0 revision=1 build_style=cmake short_desc="Machine-readable files for the SPIR-V Registry" maintainer="Orphaned " license="MIT" homepage="https://github.com/KhronosGroup/SPIRV-Headers" -distfiles="https://github.com/KhronosGroup/SPIRV-Headers/archive/sdk-${version}.tar.gz" -checksum=fc340700b005e9a2adc98475b5afbbabd1bc931f789a2afd02d54ebc22522af3 +distfiles="https://github.com/KhronosGroup/SPIRV-Headers/archive/vulkan-sdk-${version}.tar.gz" +checksum=1022379e5b920ae21ccfb5cb41e07b1c59352a18c3d3fdcbf38d6ae7733384d4 post_install() { vlicense LICENSE From 013efe1b138ba12da56b376e3f6d53dc153c94f8 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 Nov 2023 14:49:45 -0400 Subject: [PATCH 07/30] mesa: rebuild for llvm17 --- srcpkgs/mesa/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template index 05a35dce0d1a9..78917ebf8066e 100644 --- a/srcpkgs/mesa/template +++ b/srcpkgs/mesa/template @@ -1,19 +1,19 @@ # Template file for 'mesa' pkgname=mesa version=23.3.2 -revision=1 +revision=2 build_style=meson #Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled -Dlmsensors=enabled -Dplatforms=x11$(vopt_if wayland ,wayland) -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++17" -hostmakedepends="gettext flex llvm pkg-config python3-Mako glslang +hostmakedepends="gettext flex pkg-config python3-Mako glslang llvm17-devel $(vopt_if wayland 'wayland-protocols wayland-devel')" makedepends="elfutils-devel expat-devel libXdamage-devel libXxf86vm-devel libdrm-devel libffi-devel libva-devel libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel - $(vopt_if wayland 'wayland-devel wayland-protocols') llvm libsensors-devel + $(vopt_if wayland 'wayland-devel wayland-protocols') llvm17-devel libsensors-devel libXrandr-devel libglvnd-devel libzstd-devel libxml2-devel lua53-devel libarchive-devel" depends="libglvnd" From cacefd4c5893180e3473df36b65abffdb90131cd Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 Nov 2023 16:51:08 -0400 Subject: [PATCH 08/30] ccls: rebuild for llvm17 --- srcpkgs/ccls/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/ccls/template b/srcpkgs/ccls/template index 9c1338c267372..3e7bff1265377 100644 --- a/srcpkgs/ccls/template +++ b/srcpkgs/ccls/template @@ -1,11 +1,11 @@ # Template file for 'ccls' pkgname=ccls version=0.20230717 -revision=1 +revision=2 build_style=cmake configure_args="-DUSE_SYSTEM_RAPIDJSON=ON" hostmakedepends="clang-tools-extra" -makedepends="clang-tools-extra libxml2-devel llvm ncurses-devel rapidjson zlib-devel" +makedepends="clang-tools-extra libxml2-devel llvm17-devel ncurses-devel rapidjson zlib-devel" short_desc="C/C++/ObjC language server" maintainer="André Cerqueira " license="Apache-2.0" From da8c9f81279b1702ed7b39a768764a7f84b13aec Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 Nov 2023 17:49:25 -0400 Subject: [PATCH 09/30] clazy: rebuild for llvm17 --- srcpkgs/clazy/patches/llvm16.patch | 83 ++++++++++++++++++++++++++++++ srcpkgs/clazy/patches/llvm17.patch | 28 ++++++++++ srcpkgs/clazy/template | 4 +- 3 files changed, 113 insertions(+), 2 deletions(-) create mode 100644 srcpkgs/clazy/patches/llvm16.patch create mode 100644 srcpkgs/clazy/patches/llvm17.patch diff --git a/srcpkgs/clazy/patches/llvm16.patch b/srcpkgs/clazy/patches/llvm16.patch new file mode 100644 index 0000000000000..a5759060c112d --- /dev/null +++ b/srcpkgs/clazy/patches/llvm16.patch @@ -0,0 +1,83 @@ +From a05ac7eb6f6198c3f478bd7b5b4bfc062a8d63cc Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ivan=20=C4=8Cuki=C4=87?= +Date: Tue, 7 Feb 2023 11:06:19 +0100 +Subject: [PATCH] Adapt to API changes in clang/llvm 16 + +--- + src/SourceCompatibilityHelpers.h | 17 ++++++++++++----- + src/checkbase.h | 1 + + src/checks/level0/lambda-in-connect.cpp | 2 +- + 3 files changed, 14 insertions(+), 6 deletions(-) + +diff --git a/src/SourceCompatibilityHelpers.h b/src/SourceCompatibilityHelpers.h +index c1a23a4b..5e2dc606 100644 +--- a/src/SourceCompatibilityHelpers.h ++++ b/src/SourceCompatibilityHelpers.h +@@ -107,7 +107,11 @@ inline clang::tooling::Replacements& DiagnosticFix(clang::tooling::Diagnostic &d + + inline auto getBuffer(const clang::SourceManager &sm, clang::FileID id, bool *invalid) + { +-#if LLVM_VERSION_MAJOR >= 12 ++#if LLVM_VERSION_MAJOR >= 16 ++ auto buffer = sm.getBufferOrNone(id); ++ *invalid = !buffer.has_value(); ++ return buffer; ++#elif LLVM_VERSION_MAJOR >= 12 + auto buffer = sm.getBufferOrNone(id); + *invalid = !buffer.hasValue(); + return buffer; +@@ -116,11 +120,12 @@ inline auto getBuffer(const clang::SourceManager &sm, clang::FileID id, bool *in + #endif + } + +-#if LLVM_VERSION_MAJOR >= 12 +- ++#if LLVM_VERSION_MAJOR >= 16 ++#define GET_LEXER(id, inputFile, sm, lo) \ ++clang::Lexer(id, inputFile.value(), sm, lo) ++#elif LLVM_VERSION_MAJOR >= 12 + #define GET_LEXER(id, inputFile, sm, lo) \ + clang::Lexer(id, inputFile.getValue(), sm, lo) +- + #else + #define GET_LEXER(id, inputFile, sm, lo) \ + clang::Lexer(id, inputFile, sm, lo) +@@ -144,7 +149,9 @@ inline bool contains_lower(clang::StringRef haystack, clang::StringRef needle) + #endif + } + +-#if LLVM_VERSION_MAJOR >= 15 ++#if LLVM_VERSION_MAJOR >= 16 ++using OptionalFileEntryRef = clang::CustomizableOptional; ++#elif LLVM_VERSION_MAJOR >= 15 + using OptionalFileEntryRef = clang::Optional; + #else + using OptionalFileEntryRef = const clang::FileEntry*; +diff --git a/src/checkbase.h b/src/checkbase.h +index 02f6a6bf..6a8c634b 100644 +--- a/src/checkbase.h ++++ b/src/checkbase.h +@@ -93,6 +93,7 @@ public: + void InclusionDirective(clang::SourceLocation HashLoc, const clang::Token &IncludeTok, clang::StringRef FileName, bool IsAngled, + clang::CharSourceRange FilenameRange, clazy::OptionalFileEntryRef File, clang::StringRef SearchPath, + clang::StringRef RelativePath, const clang::Module *Imported, clang::SrcMgr::CharacteristicKind FileType) override; ++ + private: + CheckBase *const check; + }; +diff --git a/src/checks/level0/lambda-in-connect.cpp b/src/checks/level0/lambda-in-connect.cpp +index b0da926f..1ba1126f 100644 +--- a/src/checks/level0/lambda-in-connect.cpp ++++ b/src/checks/level0/lambda-in-connect.cpp +@@ -71,7 +71,7 @@ void LambdaInConnect::VisitStmt(clang::Stmt *stmt) + + for (auto capture : captures) { + if (capture.getCaptureKind() == clang::LCK_ByRef) { +- VarDecl *declForCapture = capture.getCapturedVar(); ++ auto *declForCapture = capture.getCapturedVar(); + if (declForCapture && declForCapture != receiverDecl && clazy::isValueDeclInFunctionContext(declForCapture)) + emitWarning(capture.getLocation(), "captured local variable by reference might go out of scope before lambda is called"); + } +-- +GitLab + diff --git a/srcpkgs/clazy/patches/llvm17.patch b/srcpkgs/clazy/patches/llvm17.patch new file mode 100644 index 0000000000000..910ab426070d9 --- /dev/null +++ b/srcpkgs/clazy/patches/llvm17.patch @@ -0,0 +1,28 @@ +--- a/src/checks/manuallevel/unexpected-flag-enumerator-value.cpp 2022-01-20 18:18:47.000000000 -0500 ++++ b/src/checks/manuallevel/unexpected-flag-enumerator-value.cpp 2023-11-03 17:12:24.669027622 -0400 +@@ -61,8 +61,13 @@ + if (val.isMask() && val.countTrailingOnes() >= MinOnesToQualifyAsMask) + return true; + ++#if LLVM_VERSION_MAJOR >= 17 ++ if (val.isShiftedMask() && val.popcount() >= MinOnesToQualifyAsMask) ++ return true; ++#else + if (val.isShiftedMask() && val.countPopulation() >= MinOnesToQualifyAsMask) + return true; ++#endif + + if (clazy::contains_lower(en->getName(), "mask")) + return true; +@@ -158,7 +163,11 @@ + + for (EnumConstantDecl* enumerator : enumerators) { + const auto &initVal = enumerator->getInitVal(); ++#if LLVM_VERSION_MAJOR >= 17 ++ if (!initVal.isPowerOf2() && !initVal.isZero() && !initVal.isNegative()) { ++#else + if (!initVal.isPowerOf2() && !initVal.isNullValue() && !initVal.isNegative()) { ++#endif + if (isIntentionallyNotPowerOf2(enumerator)) + continue; + const auto value = enumerator->getInitVal().getLimitedValue(); diff --git a/srcpkgs/clazy/template b/srcpkgs/clazy/template index f81de08ab836f..fdab8dda0b89b 100644 --- a/srcpkgs/clazy/template +++ b/srcpkgs/clazy/template @@ -1,11 +1,11 @@ # Template file for 'clazy' pkgname=clazy version=1.11 -revision=2 +revision=3 build_style=cmake build_helper=qemu hostmakedepends="llvm" -makedepends="clang llvm clang-tools-extra" +makedepends="clang llvm17-devel clang-tools-extra" depends="clang" short_desc="Qt oriented code checker based on clang framework" maintainer="John " From 2cde42b212cd258bacef0a35313cc0532330a6ba Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 Nov 2023 18:59:45 -0400 Subject: [PATCH 10/30] gnome-builder: rebuild for llvm17 --- srcpkgs/gnome-builder/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template index a85de84f5dd0d..5061969cb4c19 100644 --- a/srcpkgs/gnome-builder/template +++ b/srcpkgs/gnome-builder/template @@ -1,13 +1,13 @@ # Template file for 'gnome-builder' pkgname=gnome-builder version=44.1 -revision=5 +revision=6 build_style=meson build_helper=qemu configure_args="-Dhelp=true -Dnetwork_tests=false" hostmakedepends="pkg-config appstream-glib desktop-file-utils flex gobject-introspection - llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext" -makedepends="cairo-devel clang enchant2-devel flatpak-devel + mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext" +makedepends="llvm17-devel cairo-devel clang enchant2-devel flatpak-devel gtksourceview5-devel gtk4-devel json-glib-devel jsonrpc-glib-devel libgit2-glib-devel libglib-devel libostree-devel libpeas-devel libxml2-devel template-glib-devel vala-devel vte3-gtk4-devel libwebkitgtk60-devel From 0f853290f163479e01e8b0350a6c4455f8329421 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 Nov 2023 19:03:19 -0400 Subject: [PATCH 11/30] include-what-you-use: update to 0.20. --- srcpkgs/include-what-you-use/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/include-what-you-use/template b/srcpkgs/include-what-you-use/template index 1a30bc04bb2db..ee12c0ee51d88 100644 --- a/srcpkgs/include-what-you-use/template +++ b/srcpkgs/include-what-you-use/template @@ -1,17 +1,17 @@ # Template file for 'include-what-you-use' pkgname=include-what-you-use -version=0.19 +version=0.20 revision=1 build_style=cmake configure_args="-DIWYU_LLVM_ROOT_PATH=${XBPS_CROSS_BASE}/usr " hostmakedepends="python3" -makedepends="clang clang-tools-extra llvm ncurses-devel zlib-devel" +makedepends="clang clang-tools-extra llvm17-devel ncurses-devel zlib-devel" short_desc="Analyze #includes in C and C++ source files" maintainer="Leah Neukirchen " license="NCSA" homepage="https://include-what-you-use.org/" distfiles="https://include-what-you-use.org/downloads/${pkgname}-${version}.src.tar.gz" -checksum=2b10157b60ea08adc08e3896b4921c73fcadd5ec4eb652b29a34129d501e5ee0 +checksum=75fce1e6485f280f8f13f4c2d090b11d2fd2102b50857507c8413a919b7af899 python_version=3 post_install() { From 7e590088a4ae102c9a5329286629ae2385b49cb0 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 Nov 2023 19:05:52 -0400 Subject: [PATCH 12/30] juCi++: rebuild for llvm17 --- srcpkgs/juCi++/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template index 4cb4644663800..94c8a7e7cfbcd 100644 --- a/srcpkgs/juCi++/template +++ b/srcpkgs/juCi++/template @@ -1,13 +1,13 @@ # Template file for 'juCi++' pkgname=juCi++ version=1.7.2 -revision=6 +revision=7 _libclangmm_commit="9704b9b6de0982a588fa41741157d5640afedf30" _tiny_commit="839ff806dc447ff49af80f9a9eaa7949f770f8e5" create_wrksrc=yes build_style=cmake hostmakedepends="pkg-config" -makedepends="aspell-devel clang boost-devel gtksourceviewmm-devel libgit2-devel" +makedepends="aspell-devel clang-devel boost-devel gtksourceviewmm-devel libgit2-devel" depends="ctags" short_desc="Lightweight IDE supporting the most recent C++ standards" maintainer="rc-05 " From f831f22bd8d95fa27615806728fef2b05ca87f24 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 Nov 2023 20:27:29 -0400 Subject: [PATCH 13/30] kdevelop: update to 23.08.4. --- common/shlibs | 32 ++++++++++++++++---------------- srcpkgs/kdevelop/template | 12 ++++++------ 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/common/shlibs b/common/shlibs index 360a047553f5f..dea4f0dc98162 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2612,22 +2612,22 @@ libvidstab.so.1.1 libvidstab-1.1.0_1 libxdo.so.3 xdotool-3.20150503.1_1 libabigail.so.3 libabigail-2.4_1 libgnome-games-support-1.so.3 libgnome-games-support-1.4.0_1 -libKDevCMakeCommon.so.510 kdevelop-22.12.1_1 -libKDevClangPrivate.so.510 kdevelop-22.12.1_1 -libKDevCompileAnalyzerCommon.so.510 kdevelop-22.12.1_1 -libKDevelopSessionsWatch.so.510 kdevelop-22.12.1_1 -libKDevPlatformDebugger.so.510 kdevelop-22.12.1_1 -libKDevPlatformDocumentation.so.510 kdevelop-22.12.1_1 -libKDevPlatformInterfaces.so.510 kdevelop-22.12.1_1 -libKDevPlatformLanguage.so.510 kdevelop-22.12.1_1 -libKDevPlatformOutputView.so.510 kdevelop-22.12.1_1 -libKDevPlatformProject.so.510 kdevelop-22.12.1_1 -libKDevPlatformSerialization.so.510 kdevelop-22.12.1_1 -libKDevPlatformShell.so.510 kdevelop-22.12.1_1 -libKDevPlatformSublime.so.510 kdevelop-22.12.1_1 -libKDevPlatformTests.so.510 kdevelop-22.12.1_1 -libKDevPlatformUtil.so.510 kdevelop-22.12.1_1 -libKDevPlatformVcs.so.510 kdevelop-22.12.1_1 +libKDevCMakeCommon.so.512 kdevelop-23.08.2_1 +libKDevClangPrivate.so.512 kdevelop-23.08.2_1 +libKDevCompileAnalyzerCommon.so.512 kdevelop-23.08.2_1 +libKDevelopSessionsWatch.so.512 kdevelop-23.08.2_1 +libKDevPlatformDebugger.so.512 kdevelop-23.08.2_1 +libKDevPlatformDocumentation.so.512 kdevelop-23.08.2_1 +libKDevPlatformInterfaces.so.512 kdevelop-23.08.2_1 +libKDevPlatformLanguage.so.512 kdevelop-23.08.2_1 +libKDevPlatformOutputView.so.512 kdevelop-23.08.2_1 +libKDevPlatformProject.so.512 kdevelop-23.08.2_1 +libKDevPlatformSerialization.so.512 kdevelop-23.08.2_1 +libKDevPlatformShell.so.512 kdevelop-23.08.2_1 +libKDevPlatformSublime.so.512 kdevelop-23.08.2_1 +libKDevPlatformTests.so.512 kdevelop-23.08.2_1 +libKDevPlatformUtil.so.512 kdevelop-23.08.2_1 +libKDevPlatformVcs.so.512 kdevelop-23.08.2_1 libts.so.0 tslib-1.6_1 libobs.so.0 obs-0.14.1_2 libobsglad.so.1 obs-28.0.1_1 diff --git a/srcpkgs/kdevelop/template b/srcpkgs/kdevelop/template index b2c63eb78151a..4b8f41f90bb03 100644 --- a/srcpkgs/kdevelop/template +++ b/srcpkgs/kdevelop/template @@ -1,15 +1,15 @@ # Template file for 'kdevelop' pkgname=kdevelop -version=22.12.2 -revision=2 +version=23.08.4 +revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools - kcmutils kcoreaddons kdevelop-pg-qt plasma-framework gettext llvm tar which" -makedepends="apr-util-devel clang grantlee5-devel kcmutils-devel kdevelop-pg-qt + kcmutils kcoreaddons kdevelop-pg-qt plasma-framework gettext tar which" +makedepends="apr-util-devel llvm17-devel grantlee5-devel kcmutils-devel kdevelop-pg-qt kitemmodels-devel knewstuff-devel knotifyconfig-devel krunner-devel ktexteditor-devel libkomparediff2-devel libksysguard-devel okteta-devel - purpose-devel qt5-location-devel qt5-webchannel-devel subversion-devel + purpose-devel qt5-location-devel qt5-webchannel-devel subversion-devel clang-tools-extra qt5-devel $(vopt_if webengine 'qt5-webengine-devel' 'qt5-webkit-devel')" # khelpcenter is required to display documentation depends="khelpcenter" @@ -19,7 +19,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://www.kdevelop.org/" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kdevelop" distfiles="${KDE_SITE}/release-service/${version}/src/kdevelop-${version}.tar.xz" -checksum=57f85e5eb1be0ae71d3440304c985fff2be03aab02de367535568ccef7c25ec9 +checksum=91d02b2bce8f29113054ccc548e6416d94065cf79919c54075bad19599357af0 build_options="webengine" desc_option_webengine="Use Qt5 WebEngine for documentation" From e627f23eb652765d358f837c45b67784ba4f2b15 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 Nov 2023 20:35:06 -0400 Subject: [PATCH 14/30] kdevelop-php: update to 23.08.4. --- srcpkgs/kdevelop-php/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdevelop-php/template b/srcpkgs/kdevelop-php/template index 7df97b8d78845..4f3bafe2356d0 100644 --- a/srcpkgs/kdevelop-php/template +++ b/srcpkgs/kdevelop-php/template @@ -1,6 +1,6 @@ # Template file for 'kdevelop-php' pkgname=kdevelop-php -version=22.12.2 +version=23.08.4 revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -15,4 +15,4 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="https://www.kdevelop.org/" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kdev-php" distfiles="${KDE_SITE}/release-service/${version}/src/kdev-php-${version}.tar.xz" -checksum=0df5bdebfffe72cc4ae5bc842418ac30908fbaa4ae5c8762a9c4ad361c3e42b7 +checksum=20c097ff322db3d69a57d45980161ed1d72020a95fc52feb46d3fc38ba340fd0 From 683c90469ded1fbb7eefe4aee9bb0ed60deaec0a Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 Nov 2023 20:36:53 -0400 Subject: [PATCH 15/30] kdevelop-python: update to 23.08.4. --- srcpkgs/kdevelop-python/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/kdevelop-python/template b/srcpkgs/kdevelop-python/template index 0f0b8a6ec0671..e3d86278ffe63 100644 --- a/srcpkgs/kdevelop-python/template +++ b/srcpkgs/kdevelop-python/template @@ -1,7 +1,7 @@ # Template file for 'kdevelop-python' pkgname=kdevelop-python -version=22.12.2 -revision=2 +version=23.08.4 +revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" pycompile_dirs="usr/share/kdevpythonsupport" @@ -16,7 +16,7 @@ license="LGPL-2.0-or-later, GPL-2.0-or-later" homepage="https://www.kdevelop.org/" changelog="https://kde.org/announcements/changelogs/gear/${version}/#kdev-python" distfiles="${KDE_SITE}/release-service/${version}/src/kdev-python-${version}.tar.xz" -checksum=2521f2f2a7174dfb2bf1d962c460d40addc3bb486e9823c2b2707ced33456430 +checksum=a36ec94c241714c0c1f5787bafa2381c5d4ec20a3e3696bed70d13b1bd49b293 python_version=3 post_install() { From bc2c93230f0b41d43b3895682ddd87de2c2b8503 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 Nov 2023 20:56:42 -0400 Subject: [PATCH 16/30] ldc: Rebuild with old llvm15 --- common/shlibs | 4 ---- srcpkgs/ldc/template | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/common/shlibs b/common/shlibs index dea4f0dc98162..0344301de99ec 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2147,10 +2147,6 @@ libphobos2-ldc-shared.so.101 ldc-runtime-1.31.0_1 libphobos2-ldc-debug-shared.so.101 ldc-runtime-1.31.0_1 libFcitx5Qt6DBusAddons.so.1 fcitx5-qt6-5.1.4_1 libFcitx5Qt6WidgetsAddons.so.2 fcitx5-qt6-5.1.4_1 -libdruntime-ldc-shared.so.105 ldc-runtime-1.35.0_1 -libphobos2-ldc-shared.so.105 ldc-runtime-1.35.0_1 -libdruntime-ldc-debug-shared.so.105 ldc-runtime-debug-1.35.0_1 -libphobos2-ldc-debug-shared.so.105 ldc-runtime-debug-1.35.0_1 libmarblewidget-qt5.so.28 marble5-17.12.2_1 libastro.so.2 marble5-17.12.2_1 libparrot.so.6.9.0 parrot-6.9.0_1 diff --git a/srcpkgs/ldc/template b/srcpkgs/ldc/template index f6d8b7ffbe985..533d6c70d3758 100644 --- a/srcpkgs/ldc/template +++ b/srcpkgs/ldc/template @@ -1,7 +1,7 @@ # Template file for 'ldc' pkgname=ldc version=1.31.0 -revision=1 +revision=2 build_style=cmake configure_args=" -DINCLUDE_INSTALL_DIR=/usr/include/dlang/ldc From ea56d790777cad25c7e8df4faa81cd49f1e86f49 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 Nov 2023 21:06:14 -0400 Subject: [PATCH 17/30] qt6-tools: rebuild for llvm17 --- srcpkgs/qt6-tools/template | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template index 3f430540ed68a..358f58a282a76 100644 --- a/srcpkgs/qt6-tools/template +++ b/srcpkgs/qt6-tools/template @@ -1,19 +1,19 @@ # Template file for 'qt6-tools' pkgname=qt6-tools version=6.6.0 -revision=1 +revision=2 build_style=cmake configure_args="-DEXTERNAL_GUMBO=ON -DLITEHTML_UTF8=ON -DUSE_ICU=ON -DQT_BUILD_SHARED_LIBS=ON -DQT_FEATURE_assistant=ON -DQT_FEATURE_pixeltool=ON -DQT_FEATURE_distancefieldgenerator=ON" -hostmakedepends="qt6-base perl qt6-plugin-sqlite clang llvm clang-tools-extra +hostmakedepends="qt6-base perl qt6-plugin-sqlite clang clang-tools-extra qt6-declarative-host-tools" makedepends="qt6-base-devel qt6-plugin-sqlite qt6-declarative-devel - gumbo-parser-devel icu-devel llvm clang-tools-extra" + gumbo-parser-devel icu-devel llvm17-devel clang-tools-extra" short_desc="Cross-platform application and UI framework (QT6) - qt6-tools component" maintainer="John " -license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later" +license="custom:GPL-3.0-only-with-Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later" homepage="https://qt.io/" distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qttools-everywhere-src-${version}.tar.xz" checksum=4e9feebc142bbb6e453e1dc3277e09ec45c8ef081b5ee2a029e6684b5905ba99 @@ -28,6 +28,10 @@ if [ "$XBPS_CHECK_PKGS" ]; then configure_args+=" -DQT_BUILD_TESTS=ON" fi +post_install() { + vlicense LICENSES/Qt-GPL-exception-1.0.txt +} + #post_build() { # ninja -C build ${makejobs} lib/qt6/libexec/qhelpgenerator #} From 7bc8d43eea4fd8dc17a70a36103bcf3afdd2351d Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 Nov 2023 21:08:10 -0400 Subject: [PATCH 18/30] rtags: rebuild for llvm17 --- srcpkgs/rtags/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/rtags/template b/srcpkgs/rtags/template index 9b161e690d767..baa6f8c54f69f 100644 --- a/srcpkgs/rtags/template +++ b/srcpkgs/rtags/template @@ -1,12 +1,12 @@ # Template file for 'rtags' pkgname=rtags version=2.38 -revision=6 +revision=7 build_style=cmake # Don't run tests in do_install, please. configure_args="-DSKIP_CTEST=TRUE" hostmakedepends="pkg-config clang" -makedepends="llvm openssl-devel zlib-devel" +makedepends="llvm17-devel openssl-devel zlib-devel" checkdepends="perl python3-PyHamcrest python3-nose" short_desc="C/C++ indexer with integration for Emacs based on clang" maintainer="Alexander Egorenkov " From 38ef8e9806ea31e63fa56faf393d6871ee372ee0 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 Nov 2023 21:11:23 -0400 Subject: [PATCH 19/30] shiboken2: rebuild for llvm17 --- srcpkgs/shiboken2/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/shiboken2/template b/srcpkgs/shiboken2/template index 883d6a084d868..d0a38c63d9eef 100644 --- a/srcpkgs/shiboken2/template +++ b/srcpkgs/shiboken2/template @@ -1,12 +1,12 @@ # Template file for 'shiboken2' pkgname=shiboken2 version=5.15.10 -revision=1 +revision=2 _pkgname="pyside-setup-opensource-src-${version}" build_wrksrc="sources/shiboken2" build_style=cmake hostmakedepends="python3-devel python3-setuptools" -makedepends="python3-devel qt5-devel qt5-xmlpatterns-devel clang libxml2-devel +makedepends="python3-devel qt5-devel qt5-xmlpatterns-devel clang17-devel libxml2-devel libxslt-devel python3-numpy" depends="clang" short_desc="Python binding generator of Qt5 C++ API" From 625d202d149845f4d785235d14f9a8029c5b5314 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 Nov 2023 22:04:24 -0400 Subject: [PATCH 20/30] zig: Build against old llvm15 packages --- srcpkgs/zig/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/zig/template b/srcpkgs/zig/template index ca201c50131d3..52cda7e8e0cee 100644 --- a/srcpkgs/zig/template +++ b/srcpkgs/zig/template @@ -1,14 +1,14 @@ # Template file for 'zig' pkgname=zig version=0.10.1 -revision=2 +revision=3 archs="x86_64* aarch64*" build_style=cmake configure_args="-DZIG_TARGET_MCPU=baseline" make_cmd=make # we add xml2, zstd, zlib and ncurses # because our lld is static-only and requires those to work -makedepends="clang llvm15 lld-devel libxml2-devel libzstd-devel ncurses-devel zlib-devel" +makedepends="clang15 llvm15 lld15-devel libxml2-devel libzstd-devel ncurses-devel zlib-devel" short_desc="Programming language designed for robustness, optimality, and clarity" maintainer="Orphaned " license="MIT" From 27df7201fda2b42008dfd5a4698e56b89a29e4cd Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Sun, 3 Dec 2023 13:40:46 -0500 Subject: [PATCH 21/30] rust: Rebuild against llvm17 --- srcpkgs/rust/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template index d33e713857ad3..82b329424fa37 100644 --- a/srcpkgs/rust/template +++ b/srcpkgs/rust/template @@ -11,7 +11,7 @@ pkgname=rust version=1.75.0 revision=2 hostmakedepends="curl pkg-config python3 tar cargo-bootstrap" -makedepends="libffi-devel ncurses-devel libxml2-devel zlib-devel llvm15" +makedepends="libffi-devel ncurses-devel libxml2-devel zlib-devel llvm17-devel" depends="rust-std gcc" short_desc="Safe, concurrent, practical systems language" maintainer="Enno Boland " @@ -34,7 +34,7 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then fi if [ "$CROSS_BUILD" ]; then - hostmakedepends+=" rust llvm15" + hostmakedepends+=" rust llvm17-devel" # These are required for building the buildhost's stage0/1 hostmakedepends+=" libffi-devel libxml2-devel ncurses-devel zlib-devel" else From 6298dce576337fefcaf6d70358f4dfd857f3b91d Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Tue, 9 Jan 2024 00:03:41 -0500 Subject: [PATCH 22/30] libclc: update to 17.0.6. --- srcpkgs/libclc/template | 7 ++++--- srcpkgs/llvm17-doc | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) create mode 120000 srcpkgs/llvm17-doc diff --git a/srcpkgs/libclc/template b/srcpkgs/libclc/template index 2fc397a56f2ca..fa0807f9ace69 100644 --- a/srcpkgs/libclc/template +++ b/srcpkgs/libclc/template @@ -1,19 +1,20 @@ # Template file for 'libclc' pkgname=libclc -version=15.0.7 +version=17.0.6 revision=1 build_style=cmake # disable clspv (failing tests, we don't ship it) configure_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DLIBCLC_TARGETS_TO_BUILD=amdgcn--;amdgcn--amdhsa;r600--;nvptx--;nvptx64--;nvptx--nvidiacl;nvptx64--nvidiacl;spirv-mesa3d-;spirv64-mesa3d-" -hostmakedepends="clang llvm python3 libedit-devel libffi-devel +hostmakedepends="clang17 llvm17-devel python3 libedit-devel libffi-devel ncurses-devel zlib-devel SPIRV-LLVM-Translator" +makedepends="llvm17-devel" short_desc="Open implementation of the OpenCL C programming language" maintainer="Orphaned " license="BSD-3-Clause, MIT" homepage="https://libclc.llvm.org" distfiles="https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/libclc-${version}.src.tar.xz" -checksum=35731fea7be224f21acf5bf3cd9f0ed058bf4ada5eceaf7f10ee96e139bd3389 +checksum=122f641d94d5dfbb3c37534f2b76612fa59d15c36c2a4917369a85eaaca32148 replaces="libclc-git>=0" do_configure() { diff --git a/srcpkgs/llvm17-doc b/srcpkgs/llvm17-doc new file mode 120000 index 0000000000000..96970d5c02c13 --- /dev/null +++ b/srcpkgs/llvm17-doc @@ -0,0 +1 @@ +llvm17 \ No newline at end of file From cfaa9f95fd4b4be9537168f3d1165158146189b3 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Wed, 10 Jan 2024 14:50:49 -0500 Subject: [PATCH 23/30] qtcreator: update to 12.0.1. --- srcpkgs/qtcreator/template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/srcpkgs/qtcreator/template b/srcpkgs/qtcreator/template index c9ff18781412b..dd7b342439838 100644 --- a/srcpkgs/qtcreator/template +++ b/srcpkgs/qtcreator/template @@ -1,16 +1,16 @@ # Template file for 'qtcreator' pkgname=qtcreator -version=12.0.0 +version=12.0.1 revision=1 build_style=cmake configure_args="$(vopt_bool qbs BUILD_QBS) -DWITH_DOCS=ON -DBUILD_WITH_PCH=OFF" -hostmakedepends="clang llvm perl pkg-config python3 which +hostmakedepends="clang perl pkg-config python3 which qt6-base qt6-tools qtchooser qt6-shadertools qt6-declarative-host-tools" makedepends="qt6-declarative-devel qt6-quick3d-devel qt6-svg-devel qt6-plugin-odbc qt6-plugin-sqlite qt6-plugin-pgsql qt6-plugin-mysql qt6-qt5compat-devel qt6-serialport-devel - clang llvm clang-tools-extra" + clang llvm17-devel clang-tools-extra" depends="qt6-plugin-sqlite mesa-dri" short_desc="Cross-platform IDE for Qt developers" maintainer="Piotr Wójcik " @@ -18,7 +18,7 @@ license="LGPL-3.0-or-later, custom:QtCompany-GPL-Exception-1.0" homepage="https://wiki.qt.io/Category:Tools::QtCreator" changelog="https://code.qt.io/cgit/qt-creator/qt-creator.git/plain/dist/changelog/changes-${version}.md" distfiles="https://download.qt.io/official_releases/qtcreator/${version%.*}/${version}/qt-creator-opensource-src-${version}.tar.xz" -checksum=399ae0dcefa3bd9e01a3f068b93dabe8b39f9b56466c389d1446e5c84c8f7b9f +checksum=66fb92c2ced092829e3321c5a0911e2de98309d0310e7ab949a39a50238e03f3 replaces="qtcreator-data>=0" python_version=3 From e5207c64329862a5be24d8d896138abf46866779 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Wed, 31 Jan 2024 22:40:34 -0500 Subject: [PATCH 24/30] bcc: Rebuild against llvm17 --- srcpkgs/bcc/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template index 644eb378abe7c..579d276874ad2 100644 --- a/srcpkgs/bcc/template +++ b/srcpkgs/bcc/template @@ -1,11 +1,11 @@ # Template file for 'bcc' pkgname=bcc version=0.29.1 -revision=1 +revision=2 build_style=cmake configure_args="-DREVISION=${version} -DENABLE_LLVM_SHARED=1" hostmakedepends="flex python3-setuptools" -makedepends="clang clang-tools-extra elfutils-devel flex lld-devel llvm +makedepends="clang clang-tools-extra elfutils-devel flex lld-devel llvm17-devel ncurses-devel python3-devel zlib-devel" short_desc="BPF-based Linux IO analysis, networking, monitoring, and more" maintainer="Leah Neukirchen " From b507d1e6ef52ac5509908fbea37914c35495cb63 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Wed, 31 Jan 2024 22:40:55 -0500 Subject: [PATCH 25/30] ispc: Rebuild against llvm17 --- srcpkgs/ispc/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/ispc/template b/srcpkgs/ispc/template index aab387ad2c41d..9c748a6506deb 100644 --- a/srcpkgs/ispc/template +++ b/srcpkgs/ispc/template @@ -1,12 +1,12 @@ # Template file for 'ispc' pkgname=ispc version=1.22.0 -revision=1 +revision=2 archs="aarch64* x86_64*" build_style=cmake configure_args="-DISPC_INCLUDE_EXAMPLES=OFF -DISPC_INCLUDE_RT=OFF" -hostmakedepends="clang clang-tools-extra python3 m4 bison flex llvm" -makedepends="ncurses-devel ncurses-libtinfo-devel zlib-devel" +hostmakedepends="clang clang-tools-extra python3 m4 bison flex" +makedepends="llvm17-devel ncurses-devel ncurses-libtinfo-devel zlib-devel" short_desc="Compiler for high-performance SIMD programming on the CPU" maintainer="Andrea Brancaleoni " license="BSD-3-Clause" From 13f0beb6a6fc778978ed6ebb663ca5b8602dd220 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Thu, 1 Feb 2024 07:36:22 -0500 Subject: [PATCH 26/30] chromium: Rebuild against llvm17 --- srcpkgs/chromium/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template index 5613fa3813822..fd9dcd1fa61c7 100644 --- a/srcpkgs/chromium/template +++ b/srcpkgs/chromium/template @@ -2,10 +2,10 @@ pkgname=chromium # See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version version=120.0.6099.129 -revision=1 +revision=2 archs="i686* x86_64* aarch64* armv7l*" hostmakedepends=" - $(vopt_if clang "clang lld llvm15") + $(vopt_if clang "clang lld llvm") bison git gperf hwids ninja nodejs perl pkg-config python3 libepoxy-devel libevent-devel libglib-devel" makedepends=" From e7e5ce080c13d0da67a8d581dc4369024b089605 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Thu, 1 Feb 2024 07:36:38 -0500 Subject: [PATCH 27/30] ghc: Rebuild against llvm17 --- srcpkgs/ghc/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/ghc/template b/srcpkgs/ghc/template index 189d4131c50d5..1f52ca7b438ec 100644 --- a/srcpkgs/ghc/template +++ b/srcpkgs/ghc/template @@ -2,7 +2,7 @@ pkgname=ghc # Keep this synchronized with http://www.stackage.org/lts version=9.0.2 -revision=1 +revision=2 build_style=gnu-configure hostmakedepends="automake docbook-xsl ghc-bin libxslt libnuma-devel ncurses-devel python3-Sphinx python3-setuptools" @@ -56,8 +56,8 @@ fi case "$XBPS_TARGET_MACHINE" in aarch64*) # GHC uses LLVM to generate code on aarch64 - hostmakedepends+=" llvm" - depends+=" llvm" + hostmakedepends+=" llvm17-devel" + depends+=" llvm17-devel" ;; esac From eebfe44dbca07277cece18719eec83d60c91ef35 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Thu, 1 Feb 2024 07:51:51 -0500 Subject: [PATCH 28/30] faust: update to 2.70.3. --- srcpkgs/faust/patches/cstdint.patch | 12 ++++++++++++ .../patches/faust-voidlinux-lib_and_arch_paths.patch | 4 ++-- srcpkgs/faust/template | 6 +++--- 3 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/faust/patches/cstdint.patch diff --git a/srcpkgs/faust/patches/cstdint.patch b/srcpkgs/faust/patches/cstdint.patch new file mode 100644 index 0000000000000..b2358719a4168 --- /dev/null +++ b/srcpkgs/faust/patches/cstdint.patch @@ -0,0 +1,12 @@ +diff --git a/compiler/generator/Text.hh b/compiler/generator/Text.hh +index 47ca2a7be..8fad938ea 100644 +--- a/compiler/generator/Text.hh ++++ b/compiler/generator/Text.hh +@@ -31,6 +31,7 @@ + #include + #include + #include ++#include + + std::string subst(const std::string& m, const std::string& a0); + std::string subst(const std::string& m, const std::vector& vargs); diff --git a/srcpkgs/faust/patches/faust-voidlinux-lib_and_arch_paths.patch b/srcpkgs/faust/patches/faust-voidlinux-lib_and_arch_paths.patch index 3587fc639e67e..dca3779bab40e 100644 --- a/srcpkgs/faust/patches/faust-voidlinux-lib_and_arch_paths.patch +++ b/srcpkgs/faust/patches/faust-voidlinux-lib_and_arch_paths.patch @@ -1,11 +1,11 @@ --- a/compiler/global.cpp-orig 2023-09-09 10:38:02.642030383 +0000 +++ b/compiler/global.cpp 2023-09-09 10:41:55.199049192 +0000 -@@ -1679,6 +1679,7 @@ void global::initDirectories(int argc, c +@@ -1711,6 +1711,7 @@ void global::initDirectories(int argc, const char* argv[]) gImportDirList.push_back(exepath::dirup(gFaustExeDir) + "/share/faust"); gImportDirList.push_back("/usr/local/share/faust"); gImportDirList.push_back("/usr/share/faust"); + gImportDirList.push_back("/usr/lib/faust"); - + //------------------------------------------------------------------------------------- // init gArchitectureDirList : a list of path where to search architectures files @@ -1697,6 +1698,7 @@ void global::initDirectories(int argc, c diff --git a/srcpkgs/faust/template b/srcpkgs/faust/template index 8ac95644e5e88..53534571f7118 100644 --- a/srcpkgs/faust/template +++ b/srcpkgs/faust/template @@ -1,16 +1,16 @@ # Template file for 'faust' pkgname=faust -version=2.60.3 +version=2.70.3 revision=1 build_style=gnu-makefile -hostmakedepends="cmake pkg-config llvm which" +hostmakedepends="cmake pkg-config which" makedepends="libmicrohttpd-devel llvm-libunwind-devel" short_desc="Functional Programming Language for Real Time Signal Processing" maintainer="mag " license="GPL-2.0-or-later" homepage="https://faust.grame.fr/" distfiles="https://github.com/grame-cncm/faust/releases/download/${version}/faust-${version}.tar.gz" -checksum="1088b31ad2a6175ff27807afc33c5929c33e97a7d09a1995e126bdda9940fc1e" +checksum=3ac3aab87d60257b3fff03ffeb42e190480fb9828266fa1c35574b6cbf6a13bb # Android stuffs, used by the 'faust2android' script. nostrip_files="libsndfile.so libsndfile.a " From cb319619b9b6440151a2f41751154c37b6dd2df9 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Thu, 1 Feb 2024 14:13:59 -0500 Subject: [PATCH 29/30] imhex: Build with llvm15 --- srcpkgs/imhex/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/imhex/template b/srcpkgs/imhex/template index 3a9ad2d42be11..72af581ce9d12 100644 --- a/srcpkgs/imhex/template +++ b/srcpkgs/imhex/template @@ -1,7 +1,7 @@ # Template file for 'imhex' pkgname=imhex version=1.30.1 -revision=2 +revision=3 build_wrksrc="ImHex" build_style=cmake build_helper=qemu @@ -9,7 +9,7 @@ configure_args="-DIMHEX_OFFLINE_BUILD=ON -DIMHEX_STRIP_RELEASE=OFF -DUSE_SYSTEM_CURL=ON -DUSE_SYSTEM_FMT=ON -DUSE_SYSTEM_LLVM=ON -DUSE_SYSTEM_CAPSTONE=ON -DUSE_SYSTEM_YARA=ON -DUSE_SYSTEM_NLOHMANN_JSON=ON -DIMHEX_DISABLE_UPDATE_CHECK=ON" hostmakedepends="pkg-config clang-tools-extra" -makedepends="libcurl-devel fmt-devel llvm jansson-devel yara-devel json-c++ +makedepends="libcurl-devel fmt-devel llvm15 jansson-devel yara-devel json-c++ freetype-devel glfw-devel gtk+3-devel python3-devel file-devel mbedtls-devel clang-tools-extra capstone-devel" short_desc="Hex editor for reverse engineers and programmers" From b9b230d06d9b140fc32eaf2e30fb353b60b685c8 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Thu, 1 Feb 2024 15:43:09 -0500 Subject: [PATCH 30/30] thunderbird: Broken with python3.12 --- srcpkgs/thunderbird/template | 2 ++ 1 file changed, 2 insertions(+) diff --git a/srcpkgs/thunderbird/template b/srcpkgs/thunderbird/template index 2400ca23ea8a8..a745f64947c9e 100644 --- a/srcpkgs/thunderbird/template +++ b/srcpkgs/thunderbird/template @@ -29,6 +29,8 @@ depends="nss>=3.72 nspr>=4.32 desktop-file-utils hicolor-icon-theme libotr" build_options="alsa jack dbus pulseaudio xscreensaver sndio wayland" build_options_default="alsa jack dbus pulseaudio xscreensaver sndio wayland" +broken="python3.12: 'pkgutil' has no attribute 'ImpImporter'. Did you mean: 'zipimporter'" + case $XBPS_TARGET_MACHINE in armv[56]*) broken="required NEON extensions are not supported on armv6" ;; ppc64*) ;;