From 55d801b7049d78bee4df365c556366d92d246ad6 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Thu, 2 Nov 2023 23:10:07 -0400 Subject: [PATCH 01/26] New package: llvm17 --- common/shlibs | 9 +- srcpkgs/clang | 2 +- srcpkgs/clang-analyzer | 2 +- srcpkgs/clang-tools-extra | 2 +- srcpkgs/flang | 1 + srcpkgs/flang-devel | 1 + srcpkgs/libclang | 2 +- srcpkgs/libclang-cpp | 2 +- srcpkgs/libcxx | 2 +- srcpkgs/libcxx-devel | 2 +- srcpkgs/libcxxabi | 2 +- srcpkgs/libcxxabi-devel | 2 +- srcpkgs/libllvm17 | 1 + srcpkgs/libomp | 2 +- srcpkgs/libomp-devel | 2 +- srcpkgs/lld | 2 +- srcpkgs/lld-devel | 2 +- srcpkgs/lldb | 2 +- srcpkgs/lldb-devel | 2 +- srcpkgs/llvm-bolt | 1 + srcpkgs/llvm-libunwind | 2 +- srcpkgs/llvm-libunwind-devel | 2 +- srcpkgs/llvm/template | 6 +- srcpkgs/llvm15/template | 2 +- .../llvm17/files/llvm-Config-llvm-config.h | 9 + ...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 | 22 + 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 | 573 ++++++++++++++++++ srcpkgs/llvm17/update | 3 + srcpkgs/mlir | 1 + 42 files changed, 1066 insertions(+), 25 deletions(-) create mode 120000 srcpkgs/flang create mode 120000 srcpkgs/flang-devel create mode 120000 srcpkgs/libllvm17 create mode 120000 srcpkgs/llvm-bolt create mode 100644 srcpkgs/llvm17/files/llvm-Config-llvm-config.h 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/mlir diff --git a/common/shlibs b/common/shlibs index 5757ec96c6601..282f7ca841459 100644 --- a/common/shlibs +++ b/common/shlibs @@ -980,15 +980,16 @@ 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 lldb-17.0.3_1 +libclang.so.17 libclang-17.0.3_1 +libclang-cpp.so.17 libclang-cpp-17.0.3_1 libLLVM-11.so libllvm11-11.0.0_1 libLLVM-12.so libllvm12-12.0.0_1 libLLVM-15.so libllvm15-15.0.7_1 +libLLVM-17.so libllvm17-17.0.3_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 +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..96970d5c02c13 120000 --- a/srcpkgs/clang +++ b/srcpkgs/clang @@ -1 +1 @@ -llvm15 \ No newline at end of file +llvm17 \ No newline at end of file diff --git a/srcpkgs/clang-analyzer b/srcpkgs/clang-analyzer index ad57a969b9f9c..96970d5c02c13 120000 --- a/srcpkgs/clang-analyzer +++ b/srcpkgs/clang-analyzer @@ -1 +1 @@ -llvm15 \ No newline at end of file +llvm17 \ No newline at end of file diff --git a/srcpkgs/clang-tools-extra b/srcpkgs/clang-tools-extra index ad57a969b9f9c..96970d5c02c13 120000 --- a/srcpkgs/clang-tools-extra +++ b/srcpkgs/clang-tools-extra @@ -1 +1 @@ -llvm15 \ No newline at end of file +llvm17 \ No newline at end of file diff --git a/srcpkgs/flang b/srcpkgs/flang new file mode 120000 index 0000000000000..96970d5c02c13 --- /dev/null +++ b/srcpkgs/flang @@ -0,0 +1 @@ +llvm17 \ No newline at end of file diff --git a/srcpkgs/flang-devel b/srcpkgs/flang-devel new file mode 120000 index 0000000000000..96970d5c02c13 --- /dev/null +++ b/srcpkgs/flang-devel @@ -0,0 +1 @@ +llvm17 \ No newline at end of file diff --git a/srcpkgs/libclang b/srcpkgs/libclang index ad57a969b9f9c..96970d5c02c13 120000 --- a/srcpkgs/libclang +++ b/srcpkgs/libclang @@ -1 +1 @@ -llvm15 \ No newline at end of file +llvm17 \ No newline at end of file diff --git a/srcpkgs/libclang-cpp b/srcpkgs/libclang-cpp index ad57a969b9f9c..96970d5c02c13 120000 --- a/srcpkgs/libclang-cpp +++ b/srcpkgs/libclang-cpp @@ -1 +1 @@ -llvm15 \ No newline at end of file +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/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/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..96970d5c02c13 120000 --- a/srcpkgs/lld +++ b/srcpkgs/lld @@ -1 +1 @@ -llvm15 \ No newline at end of file +llvm17 \ No newline at end of file diff --git a/srcpkgs/lld-devel b/srcpkgs/lld-devel index ad57a969b9f9c..96970d5c02c13 120000 --- a/srcpkgs/lld-devel +++ b/srcpkgs/lld-devel @@ -1 +1 @@ -llvm15 \ No newline at end of file +llvm17 \ No newline at end of file diff --git a/srcpkgs/lldb b/srcpkgs/lldb index ad57a969b9f9c..96970d5c02c13 120000 --- a/srcpkgs/lldb +++ b/srcpkgs/lldb @@ -1 +1 @@ -llvm15 \ No newline at end of file +llvm17 \ No newline at end of file diff --git a/srcpkgs/lldb-devel b/srcpkgs/lldb-devel index ad57a969b9f9c..96970d5c02c13 120000 --- a/srcpkgs/lldb-devel +++ b/srcpkgs/lldb-devel @@ -1 +1 @@ -llvm15 \ No newline at end of file +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-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..24fcd5123cc53 100644 --- a/srcpkgs/llvm/template +++ b/srcpkgs/llvm/template @@ -1,11 +1,11 @@ # 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" diff --git a/srcpkgs/llvm15/template b/srcpkgs/llvm15/template index 66242f205baab..24f73810c3aa5 100644 --- a/srcpkgs/llvm15/template +++ b/srcpkgs/llvm15/template @@ -1,7 +1,7 @@ # Template file for 'llvm15' pkgname=llvm15 version=15.0.7 -revision=2 +revision=3 build_wrksrc=llvm build_style=cmake _ext_suffix=".cpython-${py3_ver/./}-linux-${XBPS_TARGET_LIBC/glibc/gnu}.so" 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/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..1dab312c83e3e --- /dev/null +++ b/srcpkgs/llvm17/patches/libcxx-armv67.patch @@ -0,0 +1,22 @@ +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]': + +--- a/libcxx/src/CMakeLists.txt ++++ b/libcxx/src/CMakeLists.txt +@@ -155,6 +155,12 @@ if (LIBCXX_GENERATE_COVERAGE AND NOT LIB + endif() + add_library_flags_if(LIBCXX_COVERAGE_LIBRARY "${LIBCXX_COVERAGE_LIBRARY}") + ++set(VOID_GCC_BUG_109180_WORKAROUND OFF CACHE BOOL "") ++ ++if (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..fd84cd1749ab1 --- /dev/null +++ b/srcpkgs/llvm17/template @@ -0,0 +1,573 @@ +# 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" +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 + -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" +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 + +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 + +# "operand out of range" assembler failures +case "$XBPS_TARGET_MACHINE" in + ppc64*) ;; + ppc*) configure_args+=" -DCLANG_ENABLE_CLANGD=OFF" ;; +esac + +_enabled_projects="clang;clang-tools-extra;compiler-rt;lld;mlir;libclc;polly" + +_lldb_enable=yes +_libomp_enable=no +_flang_enable=no +_llvm_bolt_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 + +case "$XBPS_TARGET_MACHINE" in + x86_64*|aarch64*) _flang_enable=yes;; +esac + +if [ "$_flang_enable" = "yes" ]; then + _enabled_projects+=";flang" + subpackages+=" flang flang-devel " +fi + +case "$XBPS_TARGET_MACHINE" in + x86_64*|aarch64*) _llvm_bolt_enable=yes;; +esac + +if [ "$_llvm_bolt_enable" = "yes" ]; then + _enabled_projects+=";bolt" + subpackages+=" llvm-bolt " +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 + +subpackages+=" clang clang-analyzer libclang libclang-cpp + llvm-libunwind llvm-libunwind-devel libcxx libcxx-devel + libcxxabi libcxxabi-devel libllvm17 mlir " + +if [ "$_lldb_enable" = "yes" ]; then + # XXX fails to cross compile due to python + _enabled_projects+=";lldb" + subpackages+=" lldb lldb-devel" +fi + +subpackages+=" lld lld-devel" + +configure_args+=" -DLLVM_ENABLE_PROJECTS=${_enabled_projects}" + +post_patch() { + if [ "$_lldb_enable" = "yes" ]; 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+=" -DVOID_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" + + [ "$_lldb_enable" = "yes" ] && make ${makejobs} -C tools/lldb/utils/TableGen lldb-tblgen + [ "$_lldb_enable" = "yes" ] && 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 +} + +do_install() { + cd build + cmake -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr -P cmake_install.cmake + + # 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 + + # 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 +} + +clang-analyzer_package() { + pycompile_dirs="usr/share/scan-view" + depends="clang-${version}_${revision} python3 perl" + short_desc+=" - A source code analysis framework" + homepage="https://clang-analyzer.llvm.org/" + pkg_install() { + vmove "usr/bin/scan-*" + vmove "usr/libexec/*analyzer" + vmove "usr/share/scan-*" + vmove usr/share/man/man1/scan-build.1 + } +} +clang-tools-extra_package() { + lib32disabled=yes + depends="clang-${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-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/hmaptool + vmove usr/bin/modularize + vmove usr/bin/pp-trace + vmove usr/include/clang-tidy + vmove "usr/lib/libclangApplyReplacements*" + vmove "usr/lib/libclangChangeNamespace*" + vmove "usr/lib/libclangDaemon*" + vmove "usr/lib/libclangDoc*" + vmove "usr/lib/libclangIncludeCleaner*" + vmove "usr/lib/libclangIncludeFixer*" + vmove "usr/lib/libclangMove*" + vmove "usr/lib/libclangPseudo*" + vmove "usr/lib/libclangReorderFields*" + vmove "usr/lib/libclangQuery*" + vmove "usr/lib/libclangTidy*" + vmove "usr/lib/libclangd*" + vmove "usr/lib/libfindAllSymbols*" + 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() { + lib32disabled=yes + depends="libstdc++-devel libgcc-devel binutils ${XBPS_TARGET_LIBC}-devel + libclang-${version}_${revision}" + short_desc+=" - C language family frontend" + homepage="https://clang.llvm.org/" + pkg_install() { + vmove "usr/bin/*clang*" + vmove usr/bin/c-index-test + vmove usr/bin/diagtool + vmove usr/include/clang + vmove usr/include/clang-c + vmove usr/lib/clang + vmove usr/lib/cmake/clang + 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() { + short_desc+=" - C frontend runtime library" + pkg_install() { + vmove "usr/lib/libclang.so.*" + } +} + +libclang-cpp_package() { + short_desc+=" - C frontend runtime library (C++ interface)" + pkg_install() { + vmove "usr/lib/libclang-cpp.so.*" + } +} + +lld_package() { + lib32disabled=yes + short_desc+=" - linker" + homepage="https://lld.llvm.org" + pkg_install() { + vmove "usr/bin/ld.lld*" + vmove "usr/bin/ld64.lld*" + vmove "usr/bin/lld*" + vmove usr/bin/wasm-ld + vmove usr/share/doc/LLVM/lld + } +} + +lld-devel_package() { + lib32disabled=yes + short_desc+=" - linker - development files" + homepage="https://lld.llvm.org" + depends="lld>=${version}_${revision}" + pkg_install() { + vmove usr/include/lld + vmove usr/lib/cmake/lld + vmove "usr/lib/liblld*a" + } +} + +mlir_package() { + lib32disabled=yes + short_desc+=" - multi-level IR compiler framework" + homepage="https://mlir.llvm.org/" + pkg_install() { + vmove usr/bin/mlir-pdll + vmove usr/bin/mlir-tblgen + 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/doc/LLVM/llvm/html/CommandGuide/mlir-tblgen.html + vmove usr/share/doc/LLVM/llvm/html/_sources/CommandGuide/mlir-tblgen.rst.txt + vmove usr/share/man/man1/mlir-tblgen.1 + } +} + +flang_package() { + lib32disabled=yes + short_desc+=" - Fortran language frontend" + homepage="https://flang.llvm.org/" + depends="mlir>=${version}_${revision}" + pkg_install() { + vmove "usr/bin/*flang*" + vmove "usr/lib/libflang*" + vmove usr/share/doc/LLVM/flang + } +} + +flang-devel_package() { + lib32disabled=yes + short_desc+=" - Fortran language frontend - development files" + homepage="https://flang.llvm.org/" + depends="flang>=${version}_${revision}" + pkg_install() { + vmove usr/include/flang + vmove usr/lib/cmake/flang + } +} + +# "bolt" package name is already used +llvm-bolt_package() { + lib32disabled=yes + short_desc+=" - post-link optimizer" + homepage="https://github.com/llvm/llvm-project/tree/main/bolt" + depends="clang>=${version}_${revision}" + pkg_install() { + vmove "usr/bin/*bolt*" + vmove "usr/lib/*LLVMBOLT*" + vmove usr/share/doc/LLVM/bolt + } +} + +lldb_package() { + lib32disabled=yes + depends+=" python3-six" + short_desc+=" - LLDB debugger" + homepage="https://lldb.llvm.org/" + pkg_install() { + vmove "usr/bin/*lldb*" + vmove "usr/lib/liblldb*so.*" + vmove usr/lib/python* + } +} + +lldb-devel_package() { + lib32disabled=yes + depends="lldb>=${version}_${revision}" + short_desc+=" - LLDB debugger - development files" + pkg_install() { + vmove usr/include/lldb + vmove "usr/lib/liblldb*.so" + } +} + +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} + } +} + +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/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 + } +} + +libllvm17_package() { + short_desc+=" - runtime library" + pkg_install() { + vmove "usr/lib/libLLVM-*.so*" + } +} 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/mlir b/srcpkgs/mlir new file mode 120000 index 0000000000000..96970d5c02c13 --- /dev/null +++ b/srcpkgs/mlir @@ -0,0 +1 @@ +llvm17 \ No newline at end of file From 96bef6dd10597774ed7e0a911454e6d2c9404f56 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Thu, 2 Nov 2023 23:18:25 -0400 Subject: [PATCH 02/26] New package: python3-sphinx-markdown-tables-0.0.17 --- srcpkgs/python3-sphinx-markdown-tables/template | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 srcpkgs/python3-sphinx-markdown-tables/template diff --git a/srcpkgs/python3-sphinx-markdown-tables/template b/srcpkgs/python3-sphinx-markdown-tables/template new file mode 100644 index 0000000000000..0885e33777a25 --- /dev/null +++ b/srcpkgs/python3-sphinx-markdown-tables/template @@ -0,0 +1,13 @@ +# Template file for 'python3-sphinx-markdown-tables' +pkgname=python3-sphinx-markdown-tables +version=0.0.17 +revision=1 +build_style=python3-module +hostmakedepends="python3-setuptools" +depends="python3-Markdown" +short_desc="Sphinx extension for markdown tables" +maintainer="Daniel Martinez " +license="GPL-3.0-or-later" +homepage="https://github.com/ryanfox/sphinx-markdown-tables" +distfiles="https://github.com/ryanfox/sphinx-markdown-tables/archive/refs/tags/v${version}.tar.gz" +checksum=a99586cd287dc9d2e5ce1f85f7ffa2e3d18afd96ba463d75dcad95527c0073ec From d3d178e528af581938c6519c260d8d0daf39f6fe Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 Nov 2023 09:02:42 -0400 Subject: [PATCH 03/26] llvm15: remove bumped subpackages --- srcpkgs/llvm15/template | 287 +--------------------------------------- 1 file changed, 2 insertions(+), 285 deletions(-) diff --git a/srcpkgs/llvm15/template b/srcpkgs/llvm15/template index 24f73810c3aa5..0ea8babf4be7b 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" @@ -54,59 +54,7 @@ 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" - -_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" - -if [ "$_lldb_enable" = "yes" ]; then - # XXX fails to cross compile due to python - _enabled_projects+=";lldb" - subpackages+=" lldb lldb-devel" -fi - -subpackages+=" lld lld-devel" - -configure_args+=" -DLLVM_ENABLE_PROJECTS=${_enabled_projects}" - post_patch() { - if [ "$_lldb_enable" = "yes" ]; 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 \ @@ -153,8 +101,7 @@ pre_configure() { 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} + cmake ../.. -DCMAKE_BUILD_TYPE=Release make ${makejobs} -C utils/TableGen make ${makejobs} -C tools/clang/utils/TableGen make ${makejobs} -C tools/clang/tools/extra/clang-tidy/misc/ConfusableTable @@ -164,7 +111,6 @@ pre_configure() { configure_args+=" -DCLANG_TABLEGEN=${wrksrc}/llvm/build/HOST/bin/clang-tblgen" configure_args+=" -DCLANG_TIDY_CONFUSABLE_CHARS_GEN=${wrksrc}/llvm/build/HOST/bin/clang-tidy-confusable-chars-gen" configure_args+=" -DCLANG_PSEUDO_GEN=${wrksrc}/llvm/build/HOST/bin/clang-pseudo-gen" - [ "$_lldb_enable" = "yes" ] && configure_args+=" -DLLDB_TABLEGEN=${wrksrc}/llvm/build/HOST/bin/lldb-tblgen" cd ../.. fi @@ -212,235 +158,6 @@ do_install() { 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() { - pycompile_dirs="usr/share/scan-view" - depends="clang-${version}_${revision} python3 perl" - short_desc+=" - A source code analysis framework" - homepage="https://clang-analyzer.llvm.org/" - pkg_install() { - vmove "usr/bin/scan-*" - vmove "usr/libexec/*analyzer" - vmove "usr/share/scan-*" - vmove usr/share/man/man1/scan-build.1 - } -} - -clang-tools-extra_package() { - lib32disabled=yes - depends="clang-${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-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/hmaptool - vmove usr/bin/modularize - vmove usr/bin/pp-trace - vmove usr/include/clang-tidy - vmove "usr/lib/libclangApplyReplacements*" - vmove "usr/lib/libclangChangeNamespace*" - vmove "usr/lib/libclangDaemon*" - vmove "usr/lib/libclangDoc*" - vmove "usr/lib/libclangIncludeCleaner*" - vmove "usr/lib/libclangIncludeFixer*" - vmove "usr/lib/libclangMove*" - vmove "usr/lib/libclangPseudo*" - vmove "usr/lib/libclangReorderFields*" - vmove "usr/lib/libclangQuery*" - vmove "usr/lib/libclangTidy*" - vmove "usr/lib/libclangd*" - vmove "usr/lib/libfindAllSymbols*" - 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() { - lib32disabled=yes - depends="libstdc++-devel libgcc-devel binutils ${XBPS_TARGET_LIBC}-devel - libclang-${version}_${revision}" - short_desc+=" - C language family frontend" - homepage="https://clang.llvm.org/" - pkg_install() { - vmove "usr/bin/*clang*" - vmove usr/bin/c-index-test - vmove usr/bin/diagtool - vmove usr/include/clang - vmove usr/include/clang-c - vmove usr/lib/clang - vmove usr/lib/cmake/clang - 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() { - short_desc+=" - C frontend runtime library" - pkg_install() { - vmove "usr/lib/libclang.so.*" - } -} - -libclang-cpp_package() { - short_desc+=" - C frontend runtime library (C++ interface)" - pkg_install() { - vmove "usr/lib/libclang-cpp.so.*" - } -} - -lld_package() { - lib32disabled=yes - short_desc+=" - linker" - homepage="https://lld.llvm.org" - pkg_install() { - vmove "usr/bin/ld.lld*" - vmove "usr/bin/ld64.lld*" - vmove "usr/bin/lld*" - vmove usr/bin/wasm-ld - vmove usr/share/doc/LLVM/lld - } -} - -lld-devel_package() { - lib32disabled=yes - short_desc+=" - linker - development files" - homepage="https://lld.llvm.org" - depends="lld>=${version}_${revision}" - pkg_install() { - vmove usr/include/lld - vmove usr/lib/cmake/lld - vmove "usr/lib/liblld*a" - } -} - -lldb_package() { - lib32disabled=yes - depends+=" python3-six" - short_desc+=" - LLDB debugger" - homepage="https://lldb.llvm.org/" - pkg_install() { - vmove "usr/bin/*lldb*" - vmove "usr/lib/liblldb*so.*" - vmove usr/lib/python* - } -} - -lldb-devel_package() { - lib32disabled=yes - depends="lldb>=${version}_${revision}" - short_desc+=" - LLDB debugger - development files" - pkg_install() { - vmove usr/include/lldb - vmove "usr/lib/liblldb*.so" - } -} - -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() { From c13a57c131583f6e35451793b70039e24d93bf33 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 Nov 2023 11:07:35 -0400 Subject: [PATCH 04/26] CastXML: update to 0.6.2. --- srcpkgs/CastXML/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/CastXML/template b/srcpkgs/CastXML/template index de0920900ae4c..c59fd4e0ee040 100644 --- a/srcpkgs/CastXML/template +++ b/srcpkgs/CastXML/template @@ -1,7 +1,7 @@ # 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" @@ -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 b72fbc0763dcb20a5d2d54b25255aef762a6b794 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 Nov 2023 11:07:50 -0400 Subject: [PATCH 05/26] bpftrace: update to 0.19.1. --- srcpkgs/bpftrace/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template index 34e56e8c1f595..604d54c991774 100644 --- a/srcpkgs/bpftrace/template +++ b/srcpkgs/bpftrace/template @@ -1,6 +1,6 @@ # Template file for 'bpftrace' pkgname=bpftrace -version=0.19.0 +version=0.19.1 revision=1 archs="x86_64* aarch64* ppc64*" build_style=cmake @@ -12,7 +12,7 @@ maintainer="Leah Neukirchen " license="Apache-2.0" homepage="https://github.com/iovisor/bpftrace/" distfiles="https://github.com/iovisor/bpftrace/archive/v${version}.tar.gz" -checksum=bcf3964009bfda13718ee1974c4c780434613cf900ecb3b26dd7882a8bebee36 +checksum=b520340f28ce4d6f2fb2355f1675b6801ff8498ed9e8bff14abbbf6baff5a08e nostrip=yes # needs to read own symbol table CXXFLAGS="-isystem ${XBPS_CROSS_BASE}/usr/include/bcc/compat" From 920f16b449c3886839bad8de3dc25e5b9529703a Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 Nov 2023 11:28:31 -0400 Subject: [PATCH 06/26] 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 052891a5b36e5e5744edc88d76c1c1663adaa55e Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 Nov 2023 11:50:16 -0400 Subject: [PATCH 07/26] SPIRV-LLVM-Translator: update to 17.0.0. --- common/shlibs | 2 +- srcpkgs/SPIRV-LLVM-Translator/template | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/shlibs b/common/shlibs index 282f7ca841459..b030526198ea9 100644 --- a/common/shlibs +++ b/common/shlibs @@ -987,7 +987,7 @@ libLLVM-11.so libllvm11-11.0.0_1 libLLVM-12.so libllvm12-12.0.0_1 libLLVM-15.so libllvm15-15.0.7_1 libLLVM-17.so libllvm17-17.0.3_1 -libLLVMSPIRVLib.so.15 SPIRV-LLVM-Translator-15.0.0_1 +libLLVMSPIRVLib.so.17 SPIRV-LLVM-Translator-17.0.0_1 libomp.so.5 libomp-15.0.7_1 libomptarget.so.17 libomp-17.0.3_1 libisofs.so.6 libisofs-0.6.24_1 diff --git a/srcpkgs/SPIRV-LLVM-Translator/template b/srcpkgs/SPIRV-LLVM-Translator/template index bee99f9bcbb26..65c609bdc9294 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" @@ -14,7 +14,7 @@ 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 17d0c927e29acd32ec2577ff63afb3d366eafdd3 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 Nov 2023 11:50:23 -0400 Subject: [PATCH 08/26] 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 08a31735b90eab81d95b1e638bc7fd4c2b5baf83 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 Nov 2023 14:49:45 -0400 Subject: [PATCH 09/26] mesa: rebuild for llvm17 --- srcpkgs/mesa/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template index aa7286201de9d..d5d869dcb965c 100644 --- a/srcpkgs/mesa/template +++ b/srcpkgs/mesa/template @@ -1,7 +1,7 @@ # Template file for 'mesa' pkgname=mesa version=23.3.0 -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 From 76fb987c33c82b0cc440f44ad3de36564c3f2527 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 Nov 2023 16:51:08 -0400 Subject: [PATCH 10/26] ccls: rebuild for llvm17 --- srcpkgs/ccls/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/ccls/template b/srcpkgs/ccls/template index 9c1338c267372..d0b21fa9cbb1d 100644 --- a/srcpkgs/ccls/template +++ b/srcpkgs/ccls/template @@ -1,7 +1,7 @@ # 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" From 5cda5bf7d5367f4b56ba50491a0cef30c87042ce Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 Nov 2023 17:49:25 -0400 Subject: [PATCH 11/26] clazy: rebuild for llvm17 --- srcpkgs/clazy/patches/llvm16.patch | 83 ++++++++++++++++++++++++++++++ srcpkgs/clazy/patches/llvm17.patch | 28 ++++++++++ srcpkgs/clazy/template | 2 +- 3 files changed, 112 insertions(+), 1 deletion(-) 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..bdec40488d6a4 100644 --- a/srcpkgs/clazy/template +++ b/srcpkgs/clazy/template @@ -1,7 +1,7 @@ # Template file for 'clazy' pkgname=clazy version=1.11 -revision=2 +revision=3 build_style=cmake build_helper=qemu hostmakedepends="llvm" From a62bf9cfa82058204c4e4c12a54712446ec64385 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 Nov 2023 18:03:22 -0400 Subject: [PATCH 12/26] codelite: rebuild for llvm17 --- srcpkgs/codelite/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/codelite/template b/srcpkgs/codelite/template index f8206426888fd..ea61ee6e27507 100644 --- a/srcpkgs/codelite/template +++ b/srcpkgs/codelite/template @@ -1,7 +1,7 @@ # Template file for 'codelite' pkgname=codelite version=16.0.0 -revision=4 +revision=5 create_wrksrc=yes build_style=cmake build_helper=cmake-wxWidgets-gtk3 From 694390255ddf96b1804d0863202c08c8b2dc1c1b Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 Nov 2023 18:59:45 -0400 Subject: [PATCH 13/26] gnome-builder: rebuild for llvm17 --- srcpkgs/gnome-builder/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template index a85de84f5dd0d..45b89ab3bb159 100644 --- a/srcpkgs/gnome-builder/template +++ b/srcpkgs/gnome-builder/template @@ -1,7 +1,7 @@ # 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" From 54dd01fc0c078b15d85d89529305bab6feb58d30 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 Nov 2023 19:03:19 -0400 Subject: [PATCH 14/26] include-what-you-use: update to 0.20. --- srcpkgs/include-what-you-use/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/include-what-you-use/template b/srcpkgs/include-what-you-use/template index 1a30bc04bb2db..a2b1d3ea32b1e 100644 --- a/srcpkgs/include-what-you-use/template +++ b/srcpkgs/include-what-you-use/template @@ -1,6 +1,6 @@ # 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 " @@ -11,7 +11,7 @@ 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 ee09a11a7fe0ad81a032137cc951376df8f0e77c Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 Nov 2023 19:05:52 -0400 Subject: [PATCH 15/26] juCi++: rebuild for llvm17 --- srcpkgs/juCi++/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template index 4cb4644663800..4b40d142462dc 100644 --- a/srcpkgs/juCi++/template +++ b/srcpkgs/juCi++/template @@ -1,7 +1,7 @@ # Template file for 'juCi++' pkgname=juCi++ version=1.7.2 -revision=6 +revision=7 _libclangmm_commit="9704b9b6de0982a588fa41741157d5640afedf30" _tiny_commit="839ff806dc447ff49af80f9a9eaa7949f770f8e5" create_wrksrc=yes From b22d90845790fb99da06b259508e44848a4715ca Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 Nov 2023 20:27:29 -0400 Subject: [PATCH 16/26] kdevelop: update to 23.08.2. --- common/shlibs | 32 ++++++++++++++++---------------- srcpkgs/kdevelop/template | 8 ++++---- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/common/shlibs b/common/shlibs index b030526198ea9..003acc72c758f 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2617,22 +2617,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..7b077494b2837 100644 --- a/srcpkgs/kdevelop/template +++ b/srcpkgs/kdevelop/template @@ -1,7 +1,7 @@ # Template file for 'kdevelop' pkgname=kdevelop -version=22.12.2 -revision=2 +version=23.08.2 +revision=1 build_style=cmake configure_args="-DBUILD_TESTING=OFF" hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools @@ -9,7 +9,7 @@ hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools makedepends="apr-util-devel clang 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=577715eeb0d6bce068987a7e66988616e9b483e8ad384901e90254fd209cc513 build_options="webengine" desc_option_webengine="Use Qt5 WebEngine for documentation" From 3b1f14927a670241c4037f3da526bd0e57b56c27 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 Nov 2023 20:35:06 -0400 Subject: [PATCH 17/26] kdevelop-php: update to 23.08.2. --- 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..b18abb55fa6d0 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.2 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=943e5a5b00ec1ad2f786145febd3673c8dce73972bfec8db1ad1782ee54038a1 From 729997f246c8a33ed871483a49f0132c5dd8991d Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 Nov 2023 20:36:53 -0400 Subject: [PATCH 18/26] kdevelop-python: update to 23.08.2. --- srcpkgs/kdevelop-python/template | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/srcpkgs/kdevelop-python/template b/srcpkgs/kdevelop-python/template index 0f0b8a6ec0671..f09346c302c0f 100644 --- a/srcpkgs/kdevelop-python/template +++ b/srcpkgs/kdevelop-python/template @@ -1,6 +1,6 @@ # Template file for 'kdevelop-python' pkgname=kdevelop-python -version=22.12.2 +version=23.08.2 revision=2 build_style=cmake configure_args="-DBUILD_TESTING=OFF" @@ -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=c408f9f8c94271b4cd9bce861c4f069dcd2df7833652c1f82aff399ec05e41a2 python_version=3 post_install() { From 447e0d95d6907df3f40baaef0092259c99c687fe Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 Nov 2023 20:56:42 -0400 Subject: [PATCH 19/26] ldc: rebuild for llvm17 --- srcpkgs/ldc/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d884355d7b4012c88bd26870fc2ca0d325f72e4a Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 Nov 2023 21:06:14 -0400 Subject: [PATCH 20/26] qt6-tools: rebuild for llvm17 --- srcpkgs/qt6-tools/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template index 3f430540ed68a..97d028de2e3e1 100644 --- a/srcpkgs/qt6-tools/template +++ b/srcpkgs/qt6-tools/template @@ -1,7 +1,7 @@ # 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 From e2b701bf8d3e783d143a09438e9965a2841a368d Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 Nov 2023 21:08:10 -0400 Subject: [PATCH 21/26] rtags: rebuild for llvm17 --- srcpkgs/rtags/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/rtags/template b/srcpkgs/rtags/template index 9b161e690d767..0067603a23362 100644 --- a/srcpkgs/rtags/template +++ b/srcpkgs/rtags/template @@ -1,7 +1,7 @@ # 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" From 07c9840965cef2b0f0cea5a96d0bf34123bb644a Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 Nov 2023 21:11:23 -0400 Subject: [PATCH 22/26] shiboken2: rebuild for llvm17 --- srcpkgs/shiboken2/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/shiboken2/template b/srcpkgs/shiboken2/template index 883d6a084d868..f3c06ec245a1f 100644 --- a/srcpkgs/shiboken2/template +++ b/srcpkgs/shiboken2/template @@ -1,7 +1,7 @@ # 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 From 2eb145ad6309815dc9ea8d79e18d2e582ab48244 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 Nov 2023 21:15:43 -0400 Subject: [PATCH 23/26] tilix: rebuild for llvm17 --- srcpkgs/tilix/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/tilix/template b/srcpkgs/tilix/template index 74ccb4dd4592d..77da7f7940caf 100644 --- a/srcpkgs/tilix/template +++ b/srcpkgs/tilix/template @@ -1,7 +1,7 @@ # Template file for 'tilix' pkgname=tilix version=1.9.4 -revision=7 +revision=8 _undead_version=1.1.8 build_wrksrc="${pkgname}-${version}" build_style=meson From 5c0dcf8d966b92bf1874ebac27d29dd675bfbb0b Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 3 Nov 2023 22:04:24 -0400 Subject: [PATCH 24/26] zig: update to 0.12.0.dev.1390. --- srcpkgs/zig/template | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/srcpkgs/zig/template b/srcpkgs/zig/template index 55b31e5573c44..be6da17fc8b86 100644 --- a/srcpkgs/zig/template +++ b/srcpkgs/zig/template @@ -1,20 +1,22 @@ # Template file for 'zig' pkgname=zig -version=0.10.1 -revision=2 +version=0.12.0.dev.1390 +revision=1 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="clang llvm lld-devel libxml2-devel libzstd-devel ncurses-devel zlib-devel" short_desc="Programming language designed for robustness, optimality, and clarity" maintainer="Isaac Freund " license="MIT" homepage="https://ziglang.org" -distfiles="https://ziglang.org/download/${version}/zig-${version}.tar.xz" -checksum=69459bc804333df077d441ef052ffa143d53012b655a51f04cfef1414c04168c +#distfiles="https://ziglang.org/download/${version}/zig-${version}.tar.xz" +# zig 12 needs llvm == 17 +distfiles="https://ziglang.org/builds/zig-0.12.0-dev.1390+94cee4fb2.tar.xz" +checksum=621fc37bb70c4ce4e2edbbade19ef055404793e2289f6daed92c34269bcad1eb nopie=yes nocross=yes From 571962e7b3e8d15ffeba530de85c03bd24d8bbf1 Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Sun, 3 Dec 2023 13:40:46 -0500 Subject: [PATCH 25/26] rust: update to 1.74.0. --- srcpkgs/rust/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template index b0fc2d3cbd734..87258514d685f 100644 --- a/srcpkgs/rust/template +++ b/srcpkgs/rust/template @@ -8,10 +8,10 @@ # uploaded to https://repo-default.voidlinux.org/distfiles/ # pkgname=rust -version=1.74.1 -revision=1 +version=1.74.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" depends="rust-std gcc" short_desc="Safe, concurrent, practical systems language" maintainer="Enno Boland " From d2543096ab39c1e8169f621c837357d0e424cbac Mon Sep 17 00:00:00 2001 From: Daniel Martinez Date: Fri, 8 Dec 2023 10:36:06 -0500 Subject: [PATCH 26/26] fixup llvm17 --- srcpkgs/llvm17/template | 1 - 1 file changed, 1 deletion(-) diff --git a/srcpkgs/llvm17/template b/srcpkgs/llvm17/template index fd84cd1749ab1..12eeeb86efb93 100644 --- a/srcpkgs/llvm17/template +++ b/srcpkgs/llvm17/template @@ -453,7 +453,6 @@ llvm-bolt_package() { depends="clang>=${version}_${revision}" pkg_install() { vmove "usr/bin/*bolt*" - vmove "usr/lib/*LLVMBOLT*" vmove usr/share/doc/LLVM/bolt } }