From: tranzystorek-io <tranzystorek-io@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] LLVM 15
Date: Sat, 18 Mar 2023 17:35:46 +0100 [thread overview]
Message-ID: <20230318163546.S7KGOXK-WYEuUCGohn-uj8dLFyOvHPlqbyfzKKajPVQ@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-40821@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1443 bytes --]
There is an updated pull request by tranzystorek-io against master on the void-packages repository
https://github.com/tranzystorek-io/void-packages llvm15
https://github.com/void-linux/void-packages/pull/40821
LLVM 15
[ci skip]
TODO:
- [x] ~~Adjust patches marked as `.patch.skip`~~ dropped support for ppc
- [x] Make libomp a shlib (change so file name and install a symlink)
- [x] Avoid creating triplet dirs under /usr/
- [ ] Fix arm 32bit build https://github.com/void-linux/void-packages/pull/40821#issuecomment-1444617897
TODO LLVM rdeps:
- [x] clazy ~~(breaking changes in clang API)~~ - patched
- [x] beignet (https://github.com/void-linux/void-packages/pull/41529)
- [x] ispc (1.18.1 supports LLVM `<= 14`)
- [x] ldc (1.30.0 supports LLVM `<= 14`) - builds in version 1.31
- [x] tilix fails to build with ldc 1.31 (https://github.com/gnunn1/tilix/issues/2151) - patched to use undeaD
- [x] ghdl (2.0.0 supports LLVM `<= 14`) - builds with llvm12
- [x] qt
- [x] qtcreator (#42290)
- [x] shiboken2 (tests failing with llvm15)
- [x] bpftrace (https://github.com/void-linux/void-packages/pull/39002)
- [x] libclc (tests fail with unresolved calls https://gist.githubusercontent.com/tranzystorek-io/a2aa8a0d8010af5299f7d1ff9f82c22b/raw/6d316d99d6079990b73ae77d274dd120b9560589/LastTest.log) -> removed clspv
- [x] zig
A patch file from https://github.com/void-linux/void-packages/pull/40821.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-llvm15-40821.patch --]
[-- Type: text/x-diff, Size: 110106 bytes --]
From dd666345efc07d69aeaba0e9cb97f2e853ac2c47 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 18 Dec 2022 00:36:59 +0100
Subject: [PATCH 01/26] New package: llvm15-15.0.7
---
common/shlibs | 4 +-
srcpkgs/libllvm15 | 1 +
.../llvm15/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 +
.../patches/clang-004-ppc64-musl-elfv2.patch | 48 ++
.../compiler-rt-sanitizer-ppc64-musl.patch | 35 ++
srcpkgs/llvm15/patches/libcxx-musl.patch | 26 +
srcpkgs/llvm15/patches/libcxx-ppc.patch | 22 +
.../llvm15/patches/libcxx-ssp-nonshared.patch | 11 +
srcpkgs/llvm15/patches/libcxxabi-dl.patch | 25 +
srcpkgs/llvm15/patches/libcxxabi-musl.patch | 37 ++
srcpkgs/llvm15/patches/libomp-soname.patch | 12 +
srcpkgs/llvm15/patches/lldb-musl.patch | 40 ++
srcpkgs/llvm15/patches/llvm-001-musl.patch | 57 +++
.../patches/llvm-002-musl-ppc64-elfv2.patch | 30 ++
.../patches/llvm-003-ppc-secureplt.patch | 11 +
.../patches/llvm-004-override-opt.patch | 18 +
.../llvm15/patches/llvm-005-ppc-bigpic.patch | 36 ++
.../patches/llvm-006-aarch64-mf_exec.patch | 25 +
srcpkgs/llvm15/template | 450 ++++++++++++++++++
srcpkgs/llvm15/update | 3 +
23 files changed, 1071 insertions(+), 1 deletion(-)
create mode 120000 srcpkgs/libllvm15
create mode 100644 srcpkgs/llvm15/files/llvm-Config-llvm-config.h
create mode 100644 srcpkgs/llvm15/patches/clang-001-fix-unwind-chain-inclusion.patch
create mode 100644 srcpkgs/llvm15/patches/clang-002-add-musl-triples.patch
create mode 100644 srcpkgs/llvm15/patches/clang-003-ppc64-dynamic-linker-path.patch
create mode 100644 srcpkgs/llvm15/patches/clang-004-ppc64-musl-elfv2.patch
create mode 100644 srcpkgs/llvm15/patches/compiler-rt-sanitizer-ppc64-musl.patch
create mode 100644 srcpkgs/llvm15/patches/libcxx-musl.patch
create mode 100644 srcpkgs/llvm15/patches/libcxx-ppc.patch
create mode 100644 srcpkgs/llvm15/patches/libcxx-ssp-nonshared.patch
create mode 100644 srcpkgs/llvm15/patches/libcxxabi-dl.patch
create mode 100644 srcpkgs/llvm15/patches/libcxxabi-musl.patch
create mode 100644 srcpkgs/llvm15/patches/libomp-soname.patch
create mode 100644 srcpkgs/llvm15/patches/lldb-musl.patch
create mode 100644 srcpkgs/llvm15/patches/llvm-001-musl.patch
create mode 100644 srcpkgs/llvm15/patches/llvm-002-musl-ppc64-elfv2.patch
create mode 100644 srcpkgs/llvm15/patches/llvm-003-ppc-secureplt.patch
create mode 100644 srcpkgs/llvm15/patches/llvm-004-override-opt.patch
create mode 100644 srcpkgs/llvm15/patches/llvm-005-ppc-bigpic.patch
create mode 100644 srcpkgs/llvm15/patches/llvm-006-aarch64-mf_exec.patch
create mode 100644 srcpkgs/llvm15/template
create mode 100644 srcpkgs/llvm15/update
diff --git a/common/shlibs b/common/shlibs
index 8a7c321774fc..5fd080c540a5 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -717,7 +717,6 @@ libmca_common_dstore.so.1 libopenmpi-4.0.1_1
libmca_common_ompio.so.41 libopenmpi-3.0.1_1
libmca_common_monitoring.so.50 libopenmpi-3.1.2_1
libmpi.so.40 libopenmpi-3.0.1_1
-libomp.so libomp-12.0.1_4
libompitrace.so.40 libopenmpi-3.0.1_1
libopen-pal.so.40 libopenmpi-3.0.1_1
libopen-rte.so.40 libopenmpi-3.0.1_1
@@ -992,7 +991,10 @@ libclang.so.12 libclang-12.0.0_1
libclang-cpp.so.12 libclang-cpp-12.0.0_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
libLLVMSPIRVLib.so.12 SPIRV-LLVM-Translator-12.0.0_1
+libomp.so.5 libomp-15.0.7_1
+libomptarget.so.15 libomp-15.0.7_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/libllvm15 b/srcpkgs/libllvm15
new file mode 120000
index 000000000000..ad57a969b9f9
--- /dev/null
+++ b/srcpkgs/libllvm15
@@ -0,0 +1 @@
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/llvm15/files/llvm-Config-llvm-config.h b/srcpkgs/llvm15/files/llvm-Config-llvm-config.h
new file mode 100644
index 000000000000..2fa08c9be696
--- /dev/null
+++ b/srcpkgs/llvm15/files/llvm-Config-llvm-config.h
@@ -0,0 +1,9 @@
+#include <bits/wordsize.h>
+
+#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/llvm15/patches/clang-001-fix-unwind-chain-inclusion.patch b/srcpkgs/llvm15/patches/clang-001-fix-unwind-chain-inclusion.patch
new file mode 100644
index 000000000000..e4eaa7783e7a
--- /dev/null
+++ b/srcpkgs/llvm15/patches/clang-001-fix-unwind-chain-inclusion.patch
@@ -0,0 +1,44 @@
+From 352974169f0d2b5da3d5321f588f5e3b5941330e Mon Sep 17 00:00:00 2001
+From: Andrea Brancaleoni <miwaxe@gmail.com>
+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(<unwind.h>)
+ /* 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 <stdint.h>
+
+ #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/llvm15/patches/clang-002-add-musl-triples.patch b/srcpkgs/llvm15/patches/clang-002-add-musl-triples.patch
new file mode 100644
index 000000000000..0ef4c7e75d6b
--- /dev/null
+++ b/srcpkgs/llvm15/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/llvm15/patches/clang-003-ppc64-dynamic-linker-path.patch b/srcpkgs/llvm15/patches/clang-003-ppc64-dynamic-linker-path.patch
new file mode 100644
index 000000000000..4ad6412d1e6c
--- /dev/null
+++ b/srcpkgs/llvm15/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/llvm15/patches/clang-004-ppc64-musl-elfv2.patch b/srcpkgs/llvm15/patches/clang-004-ppc64-musl-elfv2.patch
new file mode 100644
index 000000000000..21fc8003c5f1
--- /dev/null
+++ b/srcpkgs/llvm15/patches/clang-004-ppc64-musl-elfv2.patch
@@ -0,0 +1,48 @@
+--- a/clang/lib/Basic/Targets/PPC.h
++++ b/clang/lib/Basic/Targets/PPC.h
+@@ -415,11 +415,10 @@ public:
+ LongDoubleFormat = &llvm::APFloat::IEEEdouble();
+ } else if ((Triple.getArch() == llvm::Triple::ppc64le)) {
+ DataLayout = "e-m:e-i64:64-n32:64";
+- ABI = "elfv2";
+ } else {
+ DataLayout = "E-m:e-i64:64-n32:64";
+- ABI = "elfv1";
+ }
++ ABI = "elfv2";
+
+ if (Triple.isOSFreeBSD() || Triple.isOSOpenBSD() || Triple.isMusl()) {
+ LongDoubleWidth = LongDoubleAlign = 64;
+--- a/clang/lib/CodeGen/TargetInfo.cpp
++++ b/clang/lib/CodeGen/TargetInfo.cpp
+@@ -10927,9 +10927,9 @@ const TargetCodeGenInfo &CodeGenModule::getTargetCodeGenInfo() {
+ return SetCGInfo(new AIXTargetCodeGenInfo(Types, /*Is64Bit*/ true));
+
+ if (Triple.isOSBinFormatELF()) {
+- PPC64_SVR4_ABIInfo::ABIKind Kind = PPC64_SVR4_ABIInfo::ELFv1;
+- if (getTarget().getABI() == "elfv2")
+- Kind = PPC64_SVR4_ABIInfo::ELFv2;
++ PPC64_SVR4_ABIInfo::ABIKind Kind = PPC64_SVR4_ABIInfo::ELFv2;
++ if (getTarget().getABI() == "elfv1")
++ Kind = PPC64_SVR4_ABIInfo::ELFv1;
+ bool IsSoftFloat = CodeGenOpts.FloatABI == "soft";
+
+ return SetCGInfo(
+--- a/clang/lib/Driver/ToolChains/Clang.cpp
++++ b/clang/lib/Driver/ToolChains/Clang.cpp
+@@ -1920,14 +1920,7 @@ void Clang::AddPPCTargetArgs(const ArgList &Args,
+ const llvm::Triple &T = getToolChain().getTriple();
+ if (T.isOSBinFormatELF()) {
+ switch (getToolChain().getArch()) {
+- case llvm::Triple::ppc64: {
+- if ((T.isOSFreeBSD() && T.getOSMajorVersion() >= 13) ||
+- T.isOSOpenBSD() || T.isMusl())
+- ABIName = "elfv2";
+- else
+- ABIName = "elfv1";
+- break;
+- }
++ case llvm::Triple::ppc64:
+ case llvm::Triple::ppc64le:
+ ABIName = "elfv2";
+ break;
diff --git a/srcpkgs/llvm15/patches/compiler-rt-sanitizer-ppc64-musl.patch b/srcpkgs/llvm15/patches/compiler-rt-sanitizer-ppc64-musl.patch
new file mode 100644
index 000000000000..360cfc1ba7f1
--- /dev/null
+++ b/srcpkgs/llvm15/patches/compiler-rt-sanitizer-ppc64-musl.patch
@@ -0,0 +1,35 @@
+--- a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp
++++ b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp
+@@ -74,6 +74,10 @@
+ #include <sys/utsname.h>
+ #endif
+
++#if SANITIZER_LINUX && defined(__powerpc__)
++#include <asm/ptrace.h>
++#endif
++
+ #if SANITIZER_LINUX && !SANITIZER_ANDROID
+ #include <sys/personality.h>
+ #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 <utime.h>
+ # include <sys/ptrace.h>
+ # if defined(__mips64) || defined(__aarch64__) || defined(__arm__) || \
+- defined(__hexagon__) || SANITIZER_RISCV64
++ defined(__hexagon__) || defined(__powerpc__) || SANITIZER_RISCV64
+ # include <asm/ptrace.h>
+ # 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 <sys/types.h> // for pid_t
+ #include <sys/uio.h> // for iovec
+ #include <elf.h> // for NT_PRSTATUS
+-#if (defined(__aarch64__) || SANITIZER_RISCV64) && !SANITIZER_ANDROID
++#if (defined(__aarch64__) || defined(__powerpc__) || SANITIZER_RISCV64) && !SANITIZER_ANDROID
+ // GLIBC 2.20+ sys/user does not include asm/ptrace.h
+ # include <asm/ptrace.h>
+ #endif
diff --git a/srcpkgs/llvm15/patches/libcxx-musl.patch b/srcpkgs/llvm15/patches/libcxx-musl.patch
new file mode 100644
index 000000000000..bbd31ffc2cb1
--- /dev/null
+++ b/srcpkgs/llvm15/patches/libcxx-musl.patch
@@ -0,0 +1,26 @@
+--- 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<decltype(errno)>::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
+ typename remove_reference<decltype(errno)>::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<decltype(errno)>::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
+ typename remove_reference<decltype(errno)>::type __current_errno = errno;
+ if (__current_errno == 0)
+ errno = __save_errno;
diff --git a/srcpkgs/llvm15/patches/libcxx-ppc.patch b/srcpkgs/llvm15/patches/libcxx-ppc.patch
new file mode 100644
index 000000000000..7a92f8004e1c
--- /dev/null
+++ b/srcpkgs/llvm15/patches/libcxx-ppc.patch
@@ -0,0 +1,22 @@
+This ensures `is_iec559` is defined correctly under all long double ABIs,
+including musl and its 64-bit long double. Also, `__ppc__` or `__ppc64__`
+is not defined on gcc.
+
+--- a/libcxx/include/limits
++++ b/libcxx/include/limits
+@@ -426,8 +426,14 @@ protected:
+ _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type signaling_NaN() _NOEXCEPT {return __builtin_nansl("");}
+ _LIBCPP_INLINE_VISIBILITY static _LIBCPP_CONSTEXPR type denorm_min() _NOEXCEPT {return __LDBL_DENORM_MIN__;}
+
+-#if (defined(__ppc__) || defined(__ppc64__))
++#if defined(__powerpc__) || defined(__powerpc64__)
++#if (__LDBL_MAX_EXP__ > __DBL_MAX_EXP__) || (__LDBL_MANT_DIG__ == __DBL_MANT_DIG__)
++ /* IEEE 754 quadruple or double precision */
++ static _LIBCPP_CONSTEXPR const bool is_iec559 = true;
++#else
++ /* 128-bit IBM double-double */
+ static _LIBCPP_CONSTEXPR const bool is_iec559 = false;
++#endif
+ #else
+ static _LIBCPP_CONSTEXPR const bool is_iec559 = true;
+ #endif
diff --git a/srcpkgs/llvm15/patches/libcxx-ssp-nonshared.patch b/srcpkgs/llvm15/patches/libcxx-ssp-nonshared.patch
new file mode 100644
index 000000000000..70292beb2fcd
--- /dev/null
+++ b/srcpkgs/llvm15/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/llvm15/patches/libcxxabi-dl.patch b/srcpkgs/llvm15/patches/libcxxabi-dl.patch
new file mode 100644
index 000000000000..3a15f9db8c98
--- /dev/null
+++ b/srcpkgs/llvm15/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/llvm15/patches/libcxxabi-musl.patch b/srcpkgs/llvm15/patches/libcxxabi-musl.patch
new file mode 100644
index 000000000000..55bf6f5aaa08
--- /dev/null
+++ b/srcpkgs/llvm15/patches/libcxxabi-musl.patch
@@ -0,0 +1,37 @@
+diff --git a/libcxx/include/__support/musl/xlocale.h b/libcxx/include/__support/musl/xlocale.h
+index e674a41fa..f546119b9 100644
+--- a/libcxx/include/__support/musl/xlocale.h
++++ b/libcxx/include/__support/musl/xlocale.h
+@@ -24,27 +24,27 @@
+ extern "C" {
+ #endif
+
+-inline _LIBCPP_HIDE_FROM_ABI long long
++static inline long long
+ strtoll_l(const char *__nptr, char **__endptr, int __base, locale_t) {
+ return ::strtoll(__nptr, __endptr, __base);
+ }
+
+-inline _LIBCPP_HIDE_FROM_ABI unsigned long long
++static inline unsigned long long
+ strtoull_l(const char *__nptr, char **__endptr, int __base, locale_t) {
+ return ::strtoull(__nptr, __endptr, __base);
+ }
+
+-inline _LIBCPP_HIDE_FROM_ABI long long
++static inline long long
+ wcstoll_l(const wchar_t *__nptr, wchar_t **__endptr, int __base, locale_t) {
+ return ::wcstoll(__nptr, __endptr, __base);
+ }
+
+-inline _LIBCPP_HIDE_FROM_ABI unsigned long long
++static inline unsigned long long
+ wcstoull_l(const wchar_t *__nptr, wchar_t **__endptr, int __base, locale_t) {
+ return ::wcstoull(__nptr, __endptr, __base);
+ }
+
+-inline _LIBCPP_HIDE_FROM_ABI long double
++static inline long double
+ wcstold_l(const wchar_t *__nptr, wchar_t **__endptr, locale_t) {
+ return ::wcstold(__nptr, __endptr);
+ }
diff --git a/srcpkgs/llvm15/patches/libomp-soname.patch b/srcpkgs/llvm15/patches/libomp-soname.patch
new file mode 100644
index 000000000000..9a622cd9254c
--- /dev/null
+++ b/srcpkgs/llvm15/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/llvm15/patches/lldb-musl.patch b/srcpkgs/llvm15/patches/lldb-musl.patch
new file mode 100644
index 000000000000..026c5e1e61ba
--- /dev/null
+++ b/srcpkgs/llvm15/patches/lldb-musl.patch
@@ -0,0 +1,40 @@
+--- a/lldb/source/Plugins/Process/Linux/Procfs.h
++++ b/lldb/source/Plugins/Process/Linux/Procfs.h
+@@ -10,6 +10,7 @@
+ // sys/procfs.h on Android/Linux for all supported architectures.
+
+ #include <sys/ptrace.h>
++#include <asm/ptrace.h>
+
+ #include "lldb/lldb-types.h"
+
+@@ -17,23 +18,13 @@
+
+ #include <vector>
+
+-#ifdef __ANDROID__
+-#if defined(__arm64__) || defined(__aarch64__)
+-typedef unsigned long elf_greg_t;
+-typedef elf_greg_t
+- elf_gregset_t[(sizeof(struct user_pt_regs) / sizeof(elf_greg_t))];
+-typedef struct user_fpsimd_state elf_fpregset_t;
+-#ifndef NT_FPREGSET
+-#define NT_FPREGSET NT_PRFPREG
+-#endif // NT_FPREGSET
+-#elif defined(__mips__)
+-#ifndef NT_FPREGSET
+-#define NT_FPREGSET NT_PRFPREG
+-#endif // NT_FPREGSET
+-#endif
+-#else // __ANDROID__
++#if !defined(__GLIBC__) && defined(__powerpc__)
++#define pt_regs musl_pt_regs
++#include <sys/procfs.h>
++#undef pt_regs
++#else
+ #include <sys/procfs.h>
+-#endif // __ANDROID__
++#endif
+
+ namespace lldb_private {
+ namespace process_linux {
diff --git a/srcpkgs/llvm15/patches/llvm-001-musl.patch b/srcpkgs/llvm15/patches/llvm-001-musl.patch
new file mode 100644
index 000000000000..f2a3f8d62813
--- /dev/null
+++ b/srcpkgs/llvm15/patches/llvm-001-musl.patch
@@ -0,0 +1,57 @@
+From faca3fbd15d0c3108493c3c54cd93138e049ac43 Mon Sep 17 00:00:00 2001
+From: Andrea Brancaleoni <miwaxe@gmail.com>
+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 <typename T> class ArrayRef;
+ class Triple;
+diff --git a/lib/Support/Unix/DynamicLibrary.inc b/lib/Support/Unix/DynamicLibrary.inc
+index a2a37996..2f86c470 100644
+--- a/llvm/lib/Support/Unix/DynamicLibrary.inc
++++ b/llvm/lib/Support/Unix/DynamicLibrary.inc
+@@ -102,7 +102,7 @@ static void *DoSearch(const char* SymbolName) {
+
+ // This macro returns the address of a well-known, explicit symbol
+ #define EXPLICIT_SYMBOL(SYM) \
+- if (!strcmp(SymbolName, #SYM)) return &SYM
++ if (!strcmp(SymbolName, #SYM)) return (void *)&SYM
+
+ // Under glibc we have a weird situation. The stderr/out/in symbols are both
+ // macros and global variables because of standards requirements. So, we
+diff --git a/utils/unittest/googletest/src/gtest.cc b/utils/unittest/googletest/src/gtest.cc
+index d882ab2e..f1fb12d0 100644
+--- a/llvm/utils/unittest/googletest/src/gtest.cc
++++ b/llvm/utils/unittest/googletest/src/gtest.cc
+@@ -128,6 +128,7 @@
+
+ #if GTEST_CAN_STREAM_RESULTS_
+ # include <arpa/inet.h> // NOLINT
++# include <sys/socket.h> // NOLINT
+ # include <netdb.h> // NOLINT
+ # include <sys/socket.h> // NOLINT
+ # include <sys/types.h> // NOLINT
diff --git a/srcpkgs/llvm15/patches/llvm-002-musl-ppc64-elfv2.patch b/srcpkgs/llvm15/patches/llvm-002-musl-ppc64-elfv2.patch
new file mode 100644
index 000000000000..0071d964bd37
--- /dev/null
+++ b/srcpkgs/llvm15/patches/llvm-002-musl-ppc64-elfv2.patch
@@ -0,0 +1,30 @@
+This patches LLVM to use ELFv2 on ppc64 unconditionally unless overridden. We
+need this because unlike most distros we use ELFv2 for both glibc and musl
+on big endian ppc64.
+
+diff --git a/lib/Target/PowerPC/PPCTargetMachine.cpp b/lib/Target/PowerPC/PPCTargetMachine.cpp
+index 0634833e..b7cbc2e7 100644
+--- a/llvm/lib/Target/PowerPC/PPCTargetMachine.cpp
++++ b/llvm/lib/Target/PowerPC/PPCTargetMachine.cpp
+@@ -222,9 +222,8 @@ static PPCTargetMachine::PPCABI computeTargetABI(const Triple &TT,
+
+ switch (TT.getArch()) {
+ case Triple::ppc64le:
+- return PPCTargetMachine::PPC_ABI_ELFv2;
+ case Triple::ppc64:
+- return PPCTargetMachine::PPC_ABI_ELFv1;
++ return PPCTargetMachine::PPC_ABI_ELFv2;
+ default:
+ return PPCTargetMachine::PPC_ABI_UNKNOWN;
+ }
+diff --git a/test/CodeGen/PowerPC/ppc64-elf-abi.ll b/test/CodeGen/PowerPC/ppc64-elf-abi.ll
+index 8b1cf6b5..296a2afa 100644
+--- a/llvm/test/CodeGen/PowerPC/ppc64-elf-abi.ll
++++ b/llvm/test/CodeGen/PowerPC/ppc64-elf-abi.ll
+@@ -1,4 +1,5 @@
+-; RUN: llc -verify-machineinstrs -mtriple=powerpc64-unknown-linux-gnu < %s | FileCheck %s -check-prefix=CHECK-ELFv1
++; RUN: llc -verify-machineinstrs -mtriple=powerpc64-unknown-linux-gnu < %s | FileCheck %s -check-prefix=CHECK-ELFv2
++; RUN: llc -verify-machineinstrs -mtriple=powerpc64-unknown-linux-musl < %s | FileCheck %s -check-prefix=CHECK-ELFv2
+ ; RUN: llc -verify-machineinstrs -mtriple=powerpc64-unknown-linux-gnu -target-abi elfv1 < %s | FileCheck %s -check-prefix=CHECK-ELFv1
+ ; RUN: llc -verify-machineinstrs -mtriple=powerpc64-unknown-linux-gnu -target-abi elfv2 < %s | FileCheck %s -check-prefix=CHECK-ELFv2
+ ; RUN: llc -verify-machineinstrs -mtriple=powerpc64le-unknown-linux-gnu < %s | FileCheck %s -check-prefix=CHECK-ELFv2
diff --git a/srcpkgs/llvm15/patches/llvm-003-ppc-secureplt.patch b/srcpkgs/llvm15/patches/llvm-003-ppc-secureplt.patch
new file mode 100644
index 000000000000..b5d15974375d
--- /dev/null
+++ b/srcpkgs/llvm15/patches/llvm-003-ppc-secureplt.patch
@@ -0,0 +1,11 @@
+--- a/llvm/lib/Target/PowerPC/PPCSubtarget.cpp
++++ b/llvm/lib/Target/PowerPC/PPCSubtarget.cpp
+@@ -165,7 +165,7 @@ void PPCSubtarget::initSubtargetFeatures(StringRef CPU, StringRef FS) {
+
+ if ((TargetTriple.isOSFreeBSD() && TargetTriple.getOSMajorVersion() >= 13) ||
+ TargetTriple.isOSNetBSD() || TargetTriple.isOSOpenBSD() ||
+- TargetTriple.isMusl())
++ isTargetLinux())
+ SecurePlt = true;
+
+ if (HasSPE && IsPPC64)
diff --git a/srcpkgs/llvm15/patches/llvm-004-override-opt.patch b/srcpkgs/llvm15/patches/llvm-004-override-opt.patch
new file mode 100644
index 000000000000..51d0e4b31b32
--- /dev/null
+++ b/srcpkgs/llvm15/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/llvm15/patches/llvm-005-ppc-bigpic.patch b/srcpkgs/llvm15/patches/llvm-005-ppc-bigpic.patch
new file mode 100644
index 000000000000..d332687b9d92
--- /dev/null
+++ b/srcpkgs/llvm15/patches/llvm-005-ppc-bigpic.patch
@@ -0,0 +1,36 @@
+From f3dbdd49c06bfafc1d6138094cf42889c14d38b6 Mon Sep 17 00:00:00 2001
+From: Samuel Holland <samuel@sholland.org>
+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/llvm15/patches/llvm-006-aarch64-mf_exec.patch b/srcpkgs/llvm15/patches/llvm-006-aarch64-mf_exec.patch
new file mode 100644
index 000000000000..a00abd216665
--- /dev/null
+++ b/srcpkgs/llvm15/patches/llvm-006-aarch64-mf_exec.patch
@@ -0,0 +1,25 @@
+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__) || defined (__ppc__) || \
+- defined(_POWER) || defined(_ARCH_PPC))
++ defined(_POWER) || defined(_ARCH_PPC) || (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/llvm15/template b/srcpkgs/llvm15/template
new file mode 100644
index 000000000000..adad30265bef
--- /dev/null
+++ b/srcpkgs/llvm15/template
@@ -0,0 +1,450 @@
+# Template file for 'llvm15'
+pkgname=llvm15
+version=15.0.7
+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_BINUTILS_INCDIR=/usr/include
+ -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=NO
+ -DLLDB_PYTHON_RELATIVE_PATH=lib/python${py3_ver}/site-packages
+ -DLLDB_PYTHON_EXE_RELATIVE_PATH=bin/python${py3_ver}
+ -DLLDB_PYTHON_EXT_SUFFIX=$_ext_suffix"
+hostmakedepends="perl python3 zlib-devel libffi-devel swig python3-Sphinx
+ python3-recommonmark python3-sphinx-automodapi"
+makedepends="python3-devel zlib-devel elfutils-devel libffi-devel libedit-devel
+ libxml2-devel binutils-devel libatomic-devel"
+depends="libllvm15>=${version}_${revision}"
+short_desc="Low Level Virtual Machine"
+maintainer="Orphaned <orphan@voidlinux.org>"
+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=8b5fcb24b4128cf04df1b0b9410ce8b1a729cb3c544e6da885d234280dedeac6
+lib32disabled=yes
+python_version=3
+
+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;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 \
+ ${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
+
+ case "$XBPS_TARGET_MACHINE" in
+ arm*-musl|i686-musl) # sanitizer code is broken since it duplicates some libc bits
+ vsed -i 's/set(COMPILER_RT_HAS_SANITIZER_COMMON TRUE)/set(COMPILER_RT_HAS_SANITIZER_COMMON FALSE)/' \
+ ${wrksrc}/compiler-rt/cmake/config-ix.cmake
+ ;;
+ 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" ;;
+ 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
+ make ${makejobs} -C tools/clang/utils/TableGen
+ make ${makejobs} -C tools/clang/tools/extra/clang-tidy/misc/ConfusableTable
+ make ${makejobs} -C tools/clang/tools/extra/pseudo/gen
+ [ "$_lldb_enable" = "yes" ] && make ${makejobs} -C tools/lldb/utils/TableGen
+ configure_args+=" -DLLVM_TABLEGEN=${wrksrc}/llvm/build/HOST/bin/llvm-tblgen"
+ configure_args+=" -DCLANG_TABLEGEN=${wrksrc}/llvm/build/HOST/bin/clang-tblgen"
+ configure_args+=" -DCLANG_TIDY_CONFUSABLE_CHARS_GEN=${wrksrc}/llvm/build/HOST/bin/clang-tidy-confusable-chars-gen"
+ configure_args+=" -DCLANG_PSEUDO_GEN=${wrksrc}/llvm/build/HOST/bin/clang-pseudo-gen"
+ [ "$_lldb_enable" = "yes" ] && configure_args+=" -DLLDB_TABLEGEN=${wrksrc}/llvm/build/HOST/bin/lldb-tblgen"
+ cd ../..
+ fi
+
+ 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}"
+}
+
+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
+}
+
+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() {
+ short_desc+=" - runtime library"
+ pkg_install() {
+ vmove "usr/lib/libLLVM-*.so*"
+ }
+}
diff --git a/srcpkgs/llvm15/update b/srcpkgs/llvm15/update
new file mode 100644
index 000000000000..e95cf26b3586
--- /dev/null
+++ b/srcpkgs/llvm15/update
@@ -0,0 +1,3 @@
+site="https://github.com/llvm/llvm-project/releases"
+pattern="llvmorg-\K(\d+.){2}\d+(-rc\d+)?"
+ignore="*-rc*"
From b47f1a553b577e568ee1a24dcb13f443bbcd8019 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 18 Dec 2022 00:40:18 +0100
Subject: [PATCH 02/26] llvm: update to 15
---
common/shlibs | 6 +++---
srcpkgs/clang | 2 +-
srcpkgs/clang-analyzer | 2 +-
srcpkgs/clang-tools-extra | 2 +-
srcpkgs/libclang | 2 +-
srcpkgs/libclang-cpp | 2 +-
srcpkgs/libcxx | 2 +-
srcpkgs/libcxx-devel | 2 +-
srcpkgs/libcxxabi | 2 +-
srcpkgs/libcxxabi-devel | 2 +-
srcpkgs/libomp | 2 +-
srcpkgs/libomp-devel | 2 +-
srcpkgs/lld | 2 +-
srcpkgs/lld-devel | 2 +-
srcpkgs/lldb | 2 +-
srcpkgs/lldb-devel | 2 +-
srcpkgs/llvm-libunwind | 2 +-
srcpkgs/llvm-libunwind-devel | 2 +-
srcpkgs/llvm/template | 6 +++---
19 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 5fd080c540a5..1310f006732d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -986,9 +986,9 @@ 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.12 lldb-12.0.0_1
-libclang.so.12 libclang-12.0.0_1
-libclang-cpp.so.12 libclang-cpp-12.0.0_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
libLLVM-11.so libllvm11-11.0.0_1
libLLVM-12.so libllvm12-12.0.0_1
libLLVM-15.so libllvm15-15.0.7_1
diff --git a/srcpkgs/clang b/srcpkgs/clang
index cd60fd7a981b..ad57a969b9f9 120000
--- a/srcpkgs/clang
+++ b/srcpkgs/clang
@@ -1 +1 @@
-llvm12
\ No newline at end of file
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/clang-analyzer b/srcpkgs/clang-analyzer
index cd60fd7a981b..ad57a969b9f9 120000
--- a/srcpkgs/clang-analyzer
+++ b/srcpkgs/clang-analyzer
@@ -1 +1 @@
-llvm12
\ No newline at end of file
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/clang-tools-extra b/srcpkgs/clang-tools-extra
index cd60fd7a981b..ad57a969b9f9 120000
--- a/srcpkgs/clang-tools-extra
+++ b/srcpkgs/clang-tools-extra
@@ -1 +1 @@
-llvm12
\ No newline at end of file
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/libclang b/srcpkgs/libclang
index cd60fd7a981b..ad57a969b9f9 120000
--- a/srcpkgs/libclang
+++ b/srcpkgs/libclang
@@ -1 +1 @@
-llvm12
\ No newline at end of file
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/libclang-cpp b/srcpkgs/libclang-cpp
index cd60fd7a981b..ad57a969b9f9 120000
--- a/srcpkgs/libclang-cpp
+++ b/srcpkgs/libclang-cpp
@@ -1 +1 @@
-llvm12
\ No newline at end of file
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/libcxx b/srcpkgs/libcxx
index cd60fd7a981b..ad57a969b9f9 120000
--- a/srcpkgs/libcxx
+++ b/srcpkgs/libcxx
@@ -1 +1 @@
-llvm12
\ No newline at end of file
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/libcxx-devel b/srcpkgs/libcxx-devel
index cd60fd7a981b..ad57a969b9f9 120000
--- a/srcpkgs/libcxx-devel
+++ b/srcpkgs/libcxx-devel
@@ -1 +1 @@
-llvm12
\ No newline at end of file
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/libcxxabi b/srcpkgs/libcxxabi
index cd60fd7a981b..ad57a969b9f9 120000
--- a/srcpkgs/libcxxabi
+++ b/srcpkgs/libcxxabi
@@ -1 +1 @@
-llvm12
\ No newline at end of file
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/libcxxabi-devel b/srcpkgs/libcxxabi-devel
index cd60fd7a981b..ad57a969b9f9 120000
--- a/srcpkgs/libcxxabi-devel
+++ b/srcpkgs/libcxxabi-devel
@@ -1 +1 @@
-llvm12
\ No newline at end of file
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/libomp b/srcpkgs/libomp
index cd60fd7a981b..ad57a969b9f9 120000
--- a/srcpkgs/libomp
+++ b/srcpkgs/libomp
@@ -1 +1 @@
-llvm12
\ No newline at end of file
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/libomp-devel b/srcpkgs/libomp-devel
index cd60fd7a981b..ad57a969b9f9 120000
--- a/srcpkgs/libomp-devel
+++ b/srcpkgs/libomp-devel
@@ -1 +1 @@
-llvm12
\ No newline at end of file
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/lld b/srcpkgs/lld
index cd60fd7a981b..ad57a969b9f9 120000
--- a/srcpkgs/lld
+++ b/srcpkgs/lld
@@ -1 +1 @@
-llvm12
\ No newline at end of file
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/lld-devel b/srcpkgs/lld-devel
index cd60fd7a981b..ad57a969b9f9 120000
--- a/srcpkgs/lld-devel
+++ b/srcpkgs/lld-devel
@@ -1 +1 @@
-llvm12
\ No newline at end of file
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/lldb b/srcpkgs/lldb
index cd60fd7a981b..ad57a969b9f9 120000
--- a/srcpkgs/lldb
+++ b/srcpkgs/lldb
@@ -1 +1 @@
-llvm12
\ No newline at end of file
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/lldb-devel b/srcpkgs/lldb-devel
index cd60fd7a981b..ad57a969b9f9 120000
--- a/srcpkgs/lldb-devel
+++ b/srcpkgs/lldb-devel
@@ -1 +1 @@
-llvm12
\ No newline at end of file
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/llvm-libunwind b/srcpkgs/llvm-libunwind
index cd60fd7a981b..ad57a969b9f9 120000
--- a/srcpkgs/llvm-libunwind
+++ b/srcpkgs/llvm-libunwind
@@ -1 +1 @@
-llvm12
\ No newline at end of file
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/llvm-libunwind-devel b/srcpkgs/llvm-libunwind-devel
index cd60fd7a981b..ad57a969b9f9 120000
--- a/srcpkgs/llvm-libunwind-devel
+++ b/srcpkgs/llvm-libunwind-devel
@@ -1 +1 @@
-llvm12
\ No newline at end of file
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/llvm/template b/srcpkgs/llvm/template
index a92db6f94f9f..fc1c850bd26f 100644
--- a/srcpkgs/llvm/template
+++ b/srcpkgs/llvm/template
@@ -1,11 +1,11 @@
# Template file for 'llvm'
pkgname=llvm
-version=12.0.0
+version=15
revision=1
build_style=meta
-depends="llvm12"
-replaces="llvm11>=0 llvm10>=0 llvm9>=0 llvm8>=0 llvm7>=0 llvm6.0>=0 llvm3.9>=0"
+depends="llvm15"
short_desc="LLVM meta package"
maintainer="Enno Boland <gottox@voidlinux.org>"
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"
From f2e8746aecbdddfd1fea8ad10cd496b3f62ffac6 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sun, 18 Dec 2022 12:20:08 +0100
Subject: [PATCH 03/26] llvm12: remove bumped subpackages
---
srcpkgs/llvm12/template | 264 +---------------------------------------
1 file changed, 1 insertion(+), 263 deletions(-)
diff --git a/srcpkgs/llvm12/template b/srcpkgs/llvm12/template
index f8ea3ba641ae..aea0b43cf573 100644
--- a/srcpkgs/llvm12/template
+++ b/srcpkgs/llvm12/template
@@ -50,55 +50,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*) _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}"
-fi
-
-subpackages+=" clang clang-analyzer libclang libclang-cpp
- llvm-libunwind llvm-libunwind-devel libcxx libcxx-devel
- libcxxabi libcxxabi-devel libllvm12"
-
-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
@@ -154,14 +106,12 @@ 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
[ "$_lldb_enable" = "yes" ] && make ${makejobs} -C tools/lldb/utils/TableGen
configure_args+=" -DLLVM_TABLEGEN=${wrksrc}/llvm/build/HOST/bin/llvm-tblgen"
configure_args+=" -DCLANG_TABLEGEN=${wrksrc}/llvm/build/HOST/bin/clang-tblgen"
- [ "$_lldb_enable" = "yes" ] && configure_args+=" -DLLDB_TABLEGEN=${wrksrc}/llvm/build/HOST/bin/lldb-tblgen"
cd ../..
fi
@@ -201,218 +151,6 @@ 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() {
- 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/share/man/man1/scan-build.1
- vmove "/usr/bin/scan-*"
- vmove "/usr/share/scan-*"
- vmove "/usr/libexec/*analyzer"
- }
-}
-
-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/include/clang-tidy
- vmove usr/bin/clang-apply-replacements
- vmove usr/bin/clang-query
- vmove usr/bin/clang-rename
- vmove usr/bin/clang-tidy
- vmove usr/bin/diagtool
- vmove usr/bin/find-all-symbols
- vmove usr/bin/hmaptool
- vmove usr/bin/modularize
- vmove usr/bin/pp-trace
- vmove usr/bin/sancov
- vmove "usr/lib/libclangApplyReplacements*"
- vmove "usr/lib/libclangQuery*"
- vmove "usr/lib/libclangTidy*"
- vmove "usr/share/clang/*tidy*"
- vmove usr/share/doc/clang-tools
- vmove usr/share/man/man1/extraclangtools.1
- vmove usr/share/man/man1/diagtool.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/include/clang
- vmove usr/include/clang-c
- vmove "usr/bin/*clang*"
- vmove usr/bin/c-index-test
- 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/clang
- vmove usr/share/man/man1/clang.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/lld*
- vmove usr/bin/wasm-ld
- vmove usr/bin/ld.lld*
- vmove usr/bin/ld64.lld*
- vmove usr/share/doc/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/lib/libunwind.so
- vmove usr/lib/libunwind.a
- vmove "usr/include/*unwind*"
- vmove usr/include/mach-o
- vmove usr/share/doc/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/lib/libc++abi.so
- vmove usr/lib/libc++abi.a
- vmove "usr/include/*cxxabi*"
- }
-}
-
-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/lib/libc++.so
- vmove usr/lib/libc++.a
- vmove usr/lib/libc++experimental.a
- vmove usr/include/c++
- vmove usr/share/doc/libcxx
- }
-}
-
-libomp_package() {
- short_desc+=" - Clang OpenMP support library"
- pkg_install() {
- vmove usr/lib/libomp.so
- vmove "usr/lib/libomptarget.rtl.*.so"
- vmove usr/lib/libarcher.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/libomp*.so"
- vmove "usr/lib/libarcher*"
- vmove "usr/include/omp*.h"
- vmove "usr/lib/clang/${version}/include/omp*.h"
- vmove usr/share/man/man1/llvmopenmp.1
- vmove usr/share/doc/openmp
- }
}
libllvm12_package() {
From bf22ea3b73e1228fcef53467aab182c8d9d860b4 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 5 Jan 2023 15:11:06 +0100
Subject: [PATCH 04/26] SPIRV-LLVM-Translator: update to 15.0.0
---
common/shlibs | 2 +-
srcpkgs/SPIRV-LLVM-Translator/template | 13 +++++++------
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/common/shlibs b/common/shlibs
index 1310f006732d..517ef97d2260 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -992,7 +992,7 @@ libclang-cpp.so.15 libclang-cpp-15.0.7_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
-libLLVMSPIRVLib.so.12 SPIRV-LLVM-Translator-12.0.0_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
libisofs.so.6 libisofs-0.6.24_1
diff --git a/srcpkgs/SPIRV-LLVM-Translator/template b/srcpkgs/SPIRV-LLVM-Translator/template
index a2754e58c0e8..bee99f9bcbb2 100644
--- a/srcpkgs/SPIRV-LLVM-Translator/template
+++ b/srcpkgs/SPIRV-LLVM-Translator/template
@@ -1,19 +1,20 @@
# Template file for 'SPIRV-LLVM-Translator'
pkgname=SPIRV-LLVM-Translator
-version=12.0.0
-revision=2
+version=15.0.0
+revision=1
build_style=cmake
make_build_args="llvm-spirv"
configure_args="-Wno-dev -DLLVM_LINK_LLVM_DYLIB=ON -DCMAKE_SKIP_RPATH=ON
- -DLLVM_SPIRV_INCLUDE_TESTS=OFF -DBUILD_SHARED_LIBS=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"
+makedepends="clang-tools-extra llvm SPIRV-Headers"
short_desc="API and commands for processing SPIR-V modules"
maintainer="Orphaned <orphan@voidlinux.org>"
license="NCSA"
homepage="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
-distfiles="https://github.com/KhronosGroup/${pkgname}/archive/refs/tags/v${version}.tar.gz"
-checksum=6e4fad04203f25fcde4c308c53e9f59bd05a390978992db3212d4b63aff62108
+distfiles="https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/refs/tags/v${version}.tar.gz"
+checksum=b1bebd77f72988758c00852e78c2ddc545815a612169a0cb377d021e2f846d88
post_install() {
vlicense LICENSE.TXT
From 3cbedaf3eeb963355331621be0bf7ad548fdf11e Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 5 Jan 2023 14:27:03 +0100
Subject: [PATCH 05/26] mesa: rebuild for llvm15
---
srcpkgs/mesa/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index d9ff0b2ff23d..132263d3599f 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,7 +1,7 @@
# Template file for 'mesa'
pkgname=mesa
version=22.3.5
-revision=1
+revision=2
build_style=meson
configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
-Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
From 47d0fe2d31da1afb6585d0dfc335342089ad44ae Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 5 Jan 2023 14:34:04 +0100
Subject: [PATCH 06/26] bcc: rebuild for llvm15
---
srcpkgs/bcc/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index 7526580f17ed..bdbcff7227a0 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,7 +1,7 @@
# Template file for 'bcc'
pkgname=bcc
version=0.26.0
-revision=2
+revision=3
build_style=cmake
configure_args="-DREVISION=${version} -DENABLE_LLVM_SHARED=1"
hostmakedepends="flex python3-setuptools"
From 8464758074585f9d5b1ebf02c92e065c2e046f40 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 5 Jan 2023 14:37:25 +0100
Subject: [PATCH 07/26] bpftrace: rebuild for llvm15
---
srcpkgs/bpftrace/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index 574930427ad1..eb8e37994498 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,7 +1,7 @@
# Template file for 'bpftrace'
pkgname=bpftrace
version=0.17.0
-revision=2
+revision=3
archs="x86_64* aarch64* ppc64*"
build_style=cmake
configure_args="-DUSE_SYSTEM_BPF_BCC=ON -DBUILD_TESTING=OFF" # needs root to run
From 124bb9e664c5b67d97f567b6d8c27a50bfd445ba Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 5 Jan 2023 14:43:53 +0100
Subject: [PATCH 08/26] CastXML: rebuild for llvm15
---
srcpkgs/CastXML/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/CastXML/template b/srcpkgs/CastXML/template
index 00e82ac66b50..de0920900ae4 100644
--- a/srcpkgs/CastXML/template
+++ b/srcpkgs/CastXML/template
@@ -1,7 +1,7 @@
# Template file for 'CastXML'
pkgname=CastXML
version=0.5.1
-revision=1
+revision=2
build_style=cmake
configure_args="-DSPHINX_MAN=YES -DCastXML_INSTALL_MAN_DIR=share/man"
hostmakedepends="clang python3-Sphinx"
@@ -12,7 +12,7 @@ short_desc="C-family abstract syntax tree XML output tool"
maintainer="Evgeny Ermakov <evgeny.v.ermakov@gmail.com>"
license="Apache-2.0"
homepage="https://github.com/CastXML/CastXML"
-distfiles="https://github.com/CastXML/CastXML/archive/v${version}.tar.gz"
+distfiles="https://github.com/CastXML/CastXML/archive/refs/tags/v${version}.tar.gz"
checksum=a7b40b1530585672f9cf5d7a6b6dd29f20c06cd5edf34ef34c89a184a4d1a006
post_install() {
From 74763ad4ad97135bb9e345129cd4c642a4d873ad Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 5 Jan 2023 14:48:55 +0100
Subject: [PATCH 09/26] ccls: rebuild for llvm15
---
srcpkgs/ccls/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/ccls/template b/srcpkgs/ccls/template
index 82fa61933878..ecc9f3e38a5d 100644
--- a/srcpkgs/ccls/template
+++ b/srcpkgs/ccls/template
@@ -1,7 +1,7 @@
# Template file for 'ccls'
pkgname=ccls
version=0.20220729
-revision=1
+revision=2
build_style=cmake
hostmakedepends="clang-tools-extra"
makedepends="clang-tools-extra libxml2-devel llvm ncurses-devel rapidjson zlib-devel"
From 1a4200bc335c3958445f1f7e198b33b550bddf41 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 5 Jan 2023 14:52:14 +0100
Subject: [PATCH 10/26] include-what-you-use: update to 0.19
---
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 d3655709c20c..1a30bc04bb2d 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.16
+version=0.19
revision=1
build_style=cmake
configure_args="-DIWYU_LLVM_ROOT_PATH=${XBPS_CROSS_BASE}/usr "
@@ -11,7 +11,7 @@ maintainer="Leah Neukirchen <leah@vuxu.org>"
license="NCSA"
homepage="https://include-what-you-use.org/"
distfiles="https://include-what-you-use.org/downloads/${pkgname}-${version}.src.tar.gz"
-checksum=8d6fc9b255343bc1e5ec459e39512df1d51c60e03562985e0076036119ff5a1c
+checksum=2b10157b60ea08adc08e3896b4921c73fcadd5ec4eb652b29a34129d501e5ee0
python_version=3
post_install() {
From 220bfb7279bc39a6797c9b29ff69211b22c86105 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 6 Jan 2023 17:11:04 +0100
Subject: [PATCH 11/26] rtags: rebuild for llvm15
---
srcpkgs/rtags/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/rtags/template b/srcpkgs/rtags/template
index b496a1b0e721..9b161e690d76 100644
--- a/srcpkgs/rtags/template
+++ b/srcpkgs/rtags/template
@@ -1,7 +1,7 @@
# Template file for 'rtags'
pkgname=rtags
version=2.38
-revision=5
+revision=6
build_style=cmake
# Don't run tests in do_install, please.
configure_args="-DSKIP_CTEST=TRUE"
From 1cb76c550f5e4822b2aefd296e0e9172d5c3c473 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 6 Jan 2023 17:14:14 +0100
Subject: [PATCH 12/26] juCi++: rebuild for llvm15
---
srcpkgs/juCi++/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template
index c1969237f11d..416bde7cc4d0 100644
--- a/srcpkgs/juCi++/template
+++ b/srcpkgs/juCi++/template
@@ -1,7 +1,7 @@
# Template file for 'juCi++'
pkgname=juCi++
version=1.7.2
-revision=2
+revision=3
_libclangmm_commit="9704b9b6de0982a588fa41741157d5640afedf30"
_tiny_commit="839ff806dc447ff49af80f9a9eaa7949f770f8e5"
create_wrksrc=yes
From 6fa75b5a8233bd239107274d235fc959101d0259 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 7 Jan 2023 11:31:14 +0100
Subject: [PATCH 13/26] qt5: rebuild for llvm15
---
srcpkgs/qt5/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index f4f9f5b5344a..b517b49ead2d 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -5,7 +5,7 @@ pkgname=qt5
version=5.15.7+20221119
# commit f8c9fb304bc3e53b3aa07f962cd74e9160decccc
# base repo: https://invent.kde.org/qt/qt/qt5
-revision=1
+revision=2
build_style=meta
hostmakedepends="cmake clang flex perl glib-devel pkg-config
python re2c ruby which"
From 4b6f37f329a5ac771c6dcb6ca358d5541c38a745 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Mon, 9 Jan 2023 01:22:18 +0100
Subject: [PATCH 14/26] codelite: rebuild for llvm15
---
srcpkgs/codelite/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/codelite/template b/srcpkgs/codelite/template
index 6b8b007c8a43..c6115e0274ce 100644
--- a/srcpkgs/codelite/template
+++ b/srcpkgs/codelite/template
@@ -1,7 +1,7 @@
# Template file for 'codelite'
pkgname=codelite
version=16.0.0
-revision=2
+revision=3
create_wrksrc=yes
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
From e84caba1883d23d29e4aa92a7dad08829500fbd4 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Mon, 9 Jan 2023 01:58:21 +0100
Subject: [PATCH 15/26] kdevelop: rebuild for llvm15
---
srcpkgs/kdevelop/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/kdevelop/template b/srcpkgs/kdevelop/template
index 69c9bba1b881..87bb6b2d43f7 100644
--- a/srcpkgs/kdevelop/template
+++ b/srcpkgs/kdevelop/template
@@ -1,7 +1,7 @@
# Template file for 'kdevelop'
pkgname=kdevelop
version=22.12.2
-revision=1
+revision=2
build_style=cmake
configure_args="-DBUILD_TESTING=OFF"
hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools
From e796093f8a5c139cd183752be0e0ef77580ef121 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Mon, 16 Jan 2023 14:43:47 +0100
Subject: [PATCH 16/26] zig: update to 0.10.1
---
.../0001-std.build-fix-handling-of-Dcpu.patch | 48 -------------------
srcpkgs/zig/template | 10 ++--
2 files changed, 6 insertions(+), 52 deletions(-)
delete mode 100644 srcpkgs/zig/patches/0001-std.build-fix-handling-of-Dcpu.patch
diff --git a/srcpkgs/zig/patches/0001-std.build-fix-handling-of-Dcpu.patch b/srcpkgs/zig/patches/0001-std.build-fix-handling-of-Dcpu.patch
deleted file mode 100644
index 4101f24459bb..000000000000
--- a/srcpkgs/zig/patches/0001-std.build-fix-handling-of-Dcpu.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 1e8cdace7ad324a42228aeb5cd6eb8dd15429413 Mon Sep 17 00:00:00 2001
-From: Isaac Freund <ifreund@ifreund.xyz>
-Date: Tue, 21 Sep 2021 21:06:10 +0200
-Subject: [PATCH] std.build: fix handling of -Dcpu
-
-Currently -Dcpu is completely ignored if -Dtarget isn't passed as well.
-Further, -Dcpu=baseline is ignored even if -Dtarget=native is passed.
-
-This patch fixes these 2 issues, always respecting the -Dcpu option if
-present.
----
- lib/std/build.zig | 13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
-
-diff --git a/lib/std/build.zig b/lib/std/build.zig
-index 9b7ebb1f4..e398529f9 100644
---- a/lib/std/build.zig
-+++ b/lib/std/build.zig
-@@ -685,7 +685,11 @@ pub const Builder = struct {
- );
- const mcpu = self.option([]const u8, "cpu", "Target CPU");
-
-- const triple = maybe_triple orelse return args.default_target;
-+ if (maybe_triple == null and mcpu == null) {
-+ return args.default_target;
-+ }
-+
-+ const triple = maybe_triple orelse "native";
-
- var diags: CrossTarget.ParseOptions.Diagnostics = .{};
- const selected_target = CrossTarget.parse(.{
-@@ -2451,11 +2455,8 @@ pub const LibExeObjStep = struct {
-
- if (populated_cpu_features.eql(cross.cpu.features)) {
- // The CPU name alone is sufficient.
-- // If it is the baseline CPU, no command line args are required.
-- if (cross.cpu.model != std.Target.Cpu.baseline(cross.cpu.arch).model) {
-- try zig_args.append("-mcpu");
-- try zig_args.append(cross.cpu.model.name);
-- }
-+ try zig_args.append("-mcpu");
-+ try zig_args.append(cross.cpu.model.name);
- } else {
- var mcpu_buffer = std.ArrayList(u8).init(builder.allocator);
-
---
-2.33.1
-
diff --git a/srcpkgs/zig/template b/srcpkgs/zig/template
index 728c5a64e9df..9807f7ab206b 100644
--- a/srcpkgs/zig/template
+++ b/srcpkgs/zig/template
@@ -1,17 +1,19 @@
# Template file for 'zig'
pkgname=zig
-version=0.8.1
-revision=2
+version=0.10.1
+revision=1
archs="x86_64* aarch64*"
build_style=cmake
make_cmd=make
-makedepends="clang llvm12 lld-devel"
+# 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"
short_desc="Programming language designed for robustness, optimality, and clarity"
maintainer="Isaac Freund <mail@isaacfreund.com>"
license="MIT"
homepage="https://ziglang.org"
distfiles="https://ziglang.org/download/${version}/zig-${version}.tar.xz"
-checksum=8c428e14a0a89cb7a15a6768424a37442292858cdb695e2eb503fa3c7bf47f1a
+checksum=69459bc804333df077d441ef052ffa143d53012b655a51f04cfef1414c04168c
nopie=yes
nocross=yes
From 56ca098d5d3add5babf48bc848286382f36c02c3 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Tue, 24 Jan 2023 14:03:51 +0100
Subject: [PATCH 17/26] river: update to 0.2.3
---
...ble-PIE-for-river-riverctl-rivertile.patch | 42 -------------------
srcpkgs/river/template | 10 ++---
2 files changed, 5 insertions(+), 47 deletions(-)
delete mode 100644 srcpkgs/river/patches/0001-Enable-PIE-for-river-riverctl-rivertile.patch
diff --git a/srcpkgs/river/patches/0001-Enable-PIE-for-river-riverctl-rivertile.patch b/srcpkgs/river/patches/0001-Enable-PIE-for-river-riverctl-rivertile.patch
deleted file mode 100644
index ecc68302db09..000000000000
--- a/srcpkgs/river/patches/0001-Enable-PIE-for-river-riverctl-rivertile.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 759c1c7a915083f3da46960ff82fa2a3566a7065 Mon Sep 17 00:00:00 2001
-From: Isaac Freund <mail@isaacfreund.com>
-Date: Wed, 3 Nov 2021 14:21:35 +0100
-Subject: [PATCH] Enable PIE for river, riverctl, rivertile
-
-There is sadly not yet a standard way to do this exposed by the zig
-build system. See: https://github.com/ziglang/zig/issues/7201
----
- build.zig | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/build.zig b/build.zig
-index d561f49..8ac9a4e 100644
---- a/build.zig
-+++ b/build.zig
-@@ -85,6 +85,7 @@ pub fn build(b: *zbs.Builder) !void {
- const river = b.addExecutable("river", "river/main.zig");
- river.setTarget(target);
- river.setBuildMode(mode);
-+ river.pie = true;
- river.addBuildOption(bool, "xwayland", xwayland);
- river.addBuildOption([:0]const u8, "version", full_version);
-
-@@ -97,6 +98,7 @@ pub fn build(b: *zbs.Builder) !void {
- const riverctl = b.addExecutable("riverctl", "riverctl/main.zig");
- riverctl.setTarget(target);
- riverctl.setBuildMode(mode);
-+ riverctl.pie = true;
- riverctl.addBuildOption([:0]const u8, "version", full_version);
-
- riverctl.step.dependOn(&scanner.step);
-@@ -114,6 +116,7 @@ pub fn build(b: *zbs.Builder) !void {
- const rivertile = b.addExecutable("rivertile", "rivertile/main.zig");
- rivertile.setTarget(target);
- rivertile.setBuildMode(mode);
-+ rivertile.pie = true;
- rivertile.addBuildOption([:0]const u8, "version", full_version);
-
- rivertile.step.dependOn(&scanner.step);
---
-2.33.1
-
diff --git a/srcpkgs/river/template b/srcpkgs/river/template
index 3906858d507e..431aa4bd8e8e 100644
--- a/srcpkgs/river/template
+++ b/srcpkgs/river/template
@@ -1,18 +1,18 @@
# Template file for 'river'
pkgname=river
-version=0.1.1
-revision=2
+version=0.2.3
+revision=1
build_style=zig-build
-configure_args="$(vopt_if xwayland -Dxwayland)"
+configure_args="$(vopt_if xwayland -Dxwayland) -Dpie"
hostmakedepends="pkg-config wayland-devel scdoc"
-makedepends="wlroots0.15-devel libevdev-devel"
+makedepends="wlroots-devel libevdev-devel"
depends="$(vopt_if xwayland xorg-server-xwayland)"
short_desc="Dynamic tiling Wayland compositor"
maintainer="Isaac Freund <mail@isaacfreund.com>"
license="GPL-3.0-or-later"
homepage="https://github.com/riverwm/river"
distfiles="${homepage}/releases/download/v${version}/river-${version}.tar.gz"
-checksum=2a0bcd4670ed9ebd39c279f2bf10803fc65c9f3ee2307ce40728df23ce914d18
+checksum=7acdd2b929e16a20006b4baf1f29e7a8dc7f70cf5747e1503a610a90d1637132
build_options="xwayland"
build_options_default="xwayland"
From a112e9f8f2bbb608d40d9700461d2b294d2af2ab Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 10 Feb 2023 17:25:32 +0100
Subject: [PATCH 18/26] libclc: update to 15.0.7
---
srcpkgs/libclc/template | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/libclc/template b/srcpkgs/libclc/template
index 779519fd666f..adb60f6ad1f1 100644
--- a/srcpkgs/libclc/template
+++ b/srcpkgs/libclc/template
@@ -1,9 +1,11 @@
# Template file for 'libclc'
pkgname=libclc
-version=12.0.0
+version=15.0.7
revision=1
build_style=cmake
-configure_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release"
+# 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="cmake clang llvm python3 libedit-devel libffi-devel
ncurses-devel zlib-devel SPIRV-LLVM-Translator"
short_desc="Open implementation of the OpenCL C programming language"
@@ -11,7 +13,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
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=6b777ee2cd57da1b122f76c208463f620eef508f4128210c6b1a96bfb75c74dc
+checksum=35731fea7be224f21acf5bf3cd9f0ed058bf4ada5eceaf7f10ee96e139bd3389
replaces="libclc-git>=0"
do_configure() {
From 879895b89d23d82d01b937451603154f3ebde2b6 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Fri, 10 Feb 2023 20:20:43 +0100
Subject: [PATCH 19/26] shiboken2: update to 5.15.7
---
srcpkgs/shiboken2/template | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/shiboken2/template b/srcpkgs/shiboken2/template
index 9ceb8b313de7..084ecc3ba1e1 100644
--- a/srcpkgs/shiboken2/template
+++ b/srcpkgs/shiboken2/template
@@ -1,7 +1,7 @@
# Template file for 'shiboken2'
pkgname=shiboken2
-version=5.15.5
-revision=2
+version=5.15.7
+revision=1
_pkgname="pyside-setup-opensource-src-${version}"
build_wrksrc="sources/shiboken2"
build_style=cmake
@@ -14,7 +14,7 @@ maintainer="yopito <pierre.bourgin@free.fr>"
license="GPL-3.0-or-later"
homepage="https://wiki.qt.io/Qt_for_Python/Shiboken"
distfiles="https://download.qt.io/official_releases/QtForPython/pyside2/PySide2-${version}-src/${_pkgname}.tar.xz"
-checksum=3920a4fb353300260c9bc46ff70f1fb975c5e7efa22e9d51222588928ce19b33
+checksum=f61210ae24e6882d5d0ca0059229e5dc4f35e2bca92dd6caf96c0f41943a8294
python_version=3
export CLANG_INSTALL_DIR=${XBPS_CROSS_BASE}/usr
From 210f973091993cb18357605d7c9ff81eb606d6ab Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 16 Feb 2023 20:13:02 +0100
Subject: [PATCH 20/26] clazy: rebuild for llvm15
---
.../patches/0002-llvm15-compatibility.patch | 220 ++++++++++++++++++
srcpkgs/clazy/template | 2 +-
2 files changed, 221 insertions(+), 1 deletion(-)
create mode 100644 srcpkgs/clazy/patches/0002-llvm15-compatibility.patch
diff --git a/srcpkgs/clazy/patches/0002-llvm15-compatibility.patch b/srcpkgs/clazy/patches/0002-llvm15-compatibility.patch
new file mode 100644
index 000000000000..18213a66fca1
--- /dev/null
+++ b/srcpkgs/clazy/patches/0002-llvm15-compatibility.patch
@@ -0,0 +1,220 @@
+From 20fca52da739ebefa47e35f6b338bb99a0da3cfe Mon Sep 17 00:00:00 2001
+From: Cristian Adam <cristian.adam@qt.io>
+Date: Tue, 6 Sep 2022 16:30:02 +0200
+Subject: [PATCH] Build fixes for LLVM/Clang 15.0.0
+
+Change-Id: Icc39a0b1acffb5a6a4798b1259d8ad4e7dd47bc5
+---
+ CMakeLists.txt | 6 ++++++
+ src/PreProcessorVisitor.cpp | 2 +-
+ src/PreProcessorVisitor.h | 2 +-
+ src/SourceCompatibilityHelpers.h | 15 +++++++++++++++
+ src/Utils.cpp | 3 ++-
+ src/checkbase.cpp | 4 ++--
+ src/checkbase.h | 4 ++--
+ src/checks/manuallevel/qt6-fwd-fixes.cpp | 2 +-
+ src/checks/manuallevel/qt6-fwd-fixes.h | 2 +-
+ src/checks/manuallevel/qt6-header-fixes.cpp | 2 +-
+ src/checks/manuallevel/qt6-header-fixes.h | 2 +-
+ 11 files changed, 33 insertions(+), 11 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3c780b0d..100135af 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -114,6 +114,10 @@ else()
+ set(clang_tooling_refactoring_lib clangToolingRefactor)
+ endif()
+
++if (${LLVM_VERSION} VERSION_GREATER_EQUAL "15.0.0")
++ set(clang_support_lib clangSupport)
++endif()
++
+ macro(link_to_llvm name is_standalone)
+ if (CLAZY_LINK_CLANG_DYLIB)
+ target_link_libraries(${name} clang-cpp)
+@@ -131,6 +135,7 @@ macro(link_to_llvm name is_standalone)
+
+ target_link_libraries(${name} ${clang_lib})
+ endforeach()
++ target_link_libraries(${name} ${clang_support_lib})
+ target_link_libraries(${name} clangTooling)
+ target_link_libraries(${name} clangToolingCore)
+ target_link_libraries(${name} ${clang_tooling_refactoring_lib})
+@@ -302,6 +307,7 @@ else()
+ clangFrontendTool
+ clangRewrite
+ clangSerialization
++ ${clang_support_lib}
+ clangTooling
+ clangStaticAnalyzerCheckers
+ clangStaticAnalyzerCore
+diff --git a/src/PreProcessorVisitor.cpp b/src/PreProcessorVisitor.cpp
+index 5e63a131..5fdfe5f3 100644
+--- a/src/PreProcessorVisitor.cpp
++++ b/src/PreProcessorVisitor.cpp
+@@ -185,7 +185,7 @@ void PreProcessorVisitor::MacroExpands(const Token &MacroNameTok, const MacroDef
+
+ void PreProcessorVisitor::InclusionDirective (clang::SourceLocation, const clang::Token &,
+ clang::StringRef FileName, bool IsAngled, clang::CharSourceRange FilenameRange,
+- const clang::FileEntry *, clang::StringRef, clang::StringRef,
++ clazy::OptionalFileEntryRef, clang::StringRef, clang::StringRef,
+ const clang::Module *, clang::SrcMgr::CharacteristicKind)
+ {
+ if (m_ci.getPreprocessor().isInPrimaryFile() && !clazy::endsWith(FileName.str(), ".moc")) {
+diff --git a/src/PreProcessorVisitor.h b/src/PreProcessorVisitor.h
+index dc80ff36..1bb17a5e 100644
+--- a/src/PreProcessorVisitor.h
++++ b/src/PreProcessorVisitor.h
+@@ -71,7 +71,7 @@ class PreProcessorVisitor
+ clang::SourceRange range, const clang::MacroArgs *) override;
+ void InclusionDirective (clang::SourceLocation HashLoc, const clang::Token &IncludeTok,
+ clang::StringRef FileName, bool IsAngled, clang::CharSourceRange FilenameRange,
+- const clang::FileEntry *File, clang::StringRef SearchPath, clang::StringRef RelativePath,
++ clazy::OptionalFileEntryRef File, clang::StringRef SearchPath, clang::StringRef RelativePath,
+ const clang::Module *Imported, clang::SrcMgr::CharacteristicKind FileType) override;
+ private:
+ std::string getTokenSpelling(const clang::MacroDefinition &) const;
+diff --git a/src/SourceCompatibilityHelpers.h b/src/SourceCompatibilityHelpers.h
+index 4ea923a2..c1a23a4b 100644
+--- a/src/SourceCompatibilityHelpers.h
++++ b/src/SourceCompatibilityHelpers.h
+@@ -144,6 +144,21 @@ inline bool contains_lower(clang::StringRef haystack, clang::StringRef needle)
+ #endif
+ }
+
++#if LLVM_VERSION_MAJOR >= 15
++using OptionalFileEntryRef = clang::Optional<clang::FileEntryRef>;
++#else
++using OptionalFileEntryRef = const clang::FileEntry*;
++#endif
++
++inline bool isAscii(clang::StringLiteral *lt)
++{
++#if LLVM_VERSION_MAJOR >= 15
++ return lt->isOrdinary();
++#else
++ return lt->isAscii();
++#endif
++}
++
+ }
+
+ #endif
+diff --git a/src/Utils.cpp b/src/Utils.cpp
+index 3cdf7876..70e0577c 100644
+--- a/src/Utils.cpp
++++ b/src/Utils.cpp
+@@ -25,6 +25,7 @@
+ #include "Utils.h"
+ #include "StringUtils.h"
+ #include "HierarchyUtils.h"
++#include "SourceCompatibilityHelpers.h"
+ #include "StmtBodyRange.h"
+ #include "clazy_stl.h"
+
+@@ -670,7 +671,7 @@ const CXXRecordDecl *Utils::recordForMemberCall(CXXMemberCallExpr *call, string
+ bool Utils::isAscii(StringLiteral *lt)
+ {
+ // 'é' for some reason has isAscii() == true, so also call containsNonAsciiOrNull
+- return lt && lt->isAscii() && !lt->containsNonAsciiOrNull();
++ return lt && clazy::isAscii(lt) && !lt->containsNonAsciiOrNull();
+ }
+
+ bool Utils::isInDerefExpression(Stmt *s, ParentMap *map)
+diff --git a/src/checkbase.cpp b/src/checkbase.cpp
+index f5936dfd..dcc7c999 100644
+--- a/src/checkbase.cpp
++++ b/src/checkbase.cpp
+@@ -105,7 +105,7 @@ void ClazyPreprocessorCallbacks::MacroDefined(const Token ¯oNameTok, const M
+ }
+
+ void ClazyPreprocessorCallbacks::InclusionDirective(clang::SourceLocation HashLoc, const clang::Token &IncludeTok, clang::StringRef FileName, bool IsAngled,
+- clang::CharSourceRange FilenameRange, const clang::FileEntry *File, clang::StringRef SearchPath,
++ clang::CharSourceRange FilenameRange, clazy::OptionalFileEntryRef File, clang::StringRef SearchPath,
+ clang::StringRef RelativePath, const clang::Module *Imported, clang::SrcMgr::CharacteristicKind FileType)
+ {
+ check->VisitInclusionDirective(HashLoc, IncludeTok, FileName, IsAngled, FilenameRange, File, SearchPath, RelativePath, Imported, FileType);
+@@ -182,7 +182,7 @@ void CheckBase::VisitEndif(SourceLocation, SourceLocation)
+ }
+
+ void CheckBase::VisitInclusionDirective(clang::SourceLocation , const clang::Token &, clang::StringRef , bool ,
+- clang::CharSourceRange , const clang::FileEntry *, clang::StringRef ,
++ clang::CharSourceRange , clazy::OptionalFileEntryRef, clang::StringRef ,
+ clang::StringRef , const clang::Module *, clang::SrcMgr::CharacteristicKind )
+ {
+ // Overriden in derived classes
+diff --git a/src/checkbase.h b/src/checkbase.h
+index c5db2daf..02f6a6bf 100644
+--- a/src/checkbase.h
++++ b/src/checkbase.h
+@@ -91,7 +91,7 @@ class ClazyPreprocessorCallbacks
+ void Else(clang::SourceLocation loc, clang::SourceLocation ifLoc) override;
+ void Endif(clang::SourceLocation loc, clang::SourceLocation ifLoc) override;
+ void InclusionDirective(clang::SourceLocation HashLoc, const clang::Token &IncludeTok, clang::StringRef FileName, bool IsAngled,
+- clang::CharSourceRange FilenameRange, const clang::FileEntry *File, clang::StringRef SearchPath,
++ 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;
+@@ -151,7 +151,7 @@ class CheckBase
+ virtual void VisitElse(clang::SourceLocation loc, clang::SourceLocation ifLoc);
+ virtual void VisitEndif(clang::SourceLocation loc, clang::SourceLocation ifLoc);
+ virtual void VisitInclusionDirective(clang::SourceLocation HashLoc, const clang::Token &IncludeTok, clang::StringRef FileName, bool IsAngled,
+- clang::CharSourceRange FilenameRange, const clang::FileEntry *File, clang::StringRef SearchPath,
++ clang::CharSourceRange FilenameRange, clazy::OptionalFileEntryRef File, clang::StringRef SearchPath,
+ clang::StringRef RelativePath, const clang::Module *Imported, clang::SrcMgr::CharacteristicKind FileType);
+
+ void enablePreProcessorCallbacks();
+diff --git a/src/checks/manuallevel/qt6-fwd-fixes.cpp b/src/checks/manuallevel/qt6-fwd-fixes.cpp
+index 83bf81ee..c87d9ca0 100644
+--- a/src/checks/manuallevel/qt6-fwd-fixes.cpp
++++ b/src/checks/manuallevel/qt6-fwd-fixes.cpp
+@@ -166,7 +166,7 @@ void Qt6FwdFixes::VisitDecl(clang::Decl *decl)
+ }
+
+ void Qt6FwdFixes::VisitInclusionDirective(clang::SourceLocation HashLoc, const clang::Token &IncludeTok, clang::StringRef FileName, bool IsAngled,
+- clang::CharSourceRange FilenameRange, const clang::FileEntry *File, clang::StringRef SearchPath,
++ clang::CharSourceRange FilenameRange, clazy::OptionalFileEntryRef File, clang::StringRef SearchPath,
+ clang::StringRef RelativePath, const clang::Module *Imported, clang::SrcMgr::CharacteristicKind FileType)
+ {
+ auto current_file = m_sm.getFilename(HashLoc);
+diff --git a/src/checks/manuallevel/qt6-fwd-fixes.h b/src/checks/manuallevel/qt6-fwd-fixes.h
+index 37b59d95..bb928ba6 100644
+--- a/src/checks/manuallevel/qt6-fwd-fixes.h
++++ b/src/checks/manuallevel/qt6-fwd-fixes.h
+@@ -47,7 +47,7 @@ class Qt6FwdFixes
+ explicit Qt6FwdFixes(const std::string &name, ClazyContext *context);
+ void VisitDecl(clang::Decl *decl) override;
+ void VisitInclusionDirective(clang::SourceLocation HashLoc, const clang::Token &IncludeTok, clang::StringRef FileName, bool IsAngled,
+- clang::CharSourceRange FilenameRange, const clang::FileEntry *File, clang::StringRef SearchPath,
++ clang::CharSourceRange FilenameRange, clazy::OptionalFileEntryRef File, clang::StringRef SearchPath,
+ clang::StringRef RelativePath, const clang::Module *Imported, clang::SrcMgr::CharacteristicKind FileType) override;
+ bool m_including_qcontainerfwd = false;
+ std::set<clang::StringRef> m_qcontainerfwd_included_in_files;
+diff --git a/src/checks/manuallevel/qt6-header-fixes.cpp b/src/checks/manuallevel/qt6-header-fixes.cpp
+index d458b77c..aaa28093 100644
+--- a/src/checks/manuallevel/qt6-header-fixes.cpp
++++ b/src/checks/manuallevel/qt6-header-fixes.cpp
+@@ -270,7 +270,7 @@ Qt6HeaderFixes::Qt6HeaderFixes(const std::string &name, ClazyContext *context)
+ }
+
+ void Qt6HeaderFixes::VisitInclusionDirective(clang::SourceLocation HashLoc, const clang::Token &IncludeTok, clang::StringRef FileName, bool IsAngled,
+- clang::CharSourceRange FilenameRange, const clang::FileEntry *File, clang::StringRef SearchPath,
++ clang::CharSourceRange FilenameRange, clazy::OptionalFileEntryRef File, clang::StringRef SearchPath,
+ clang::StringRef RelativePath, const clang::Module *Imported, clang::SrcMgr::CharacteristicKind FileType)
+ {
+ if (shouldIgnoreFile(HashLoc))
+diff --git a/src/checks/manuallevel/qt6-header-fixes.h b/src/checks/manuallevel/qt6-header-fixes.h
+index ae09f7ad..8ffbb100 100644
+--- a/src/checks/manuallevel/qt6-header-fixes.h
++++ b/src/checks/manuallevel/qt6-header-fixes.h
+@@ -46,7 +46,7 @@ class Qt6HeaderFixes
+ public:
+ explicit Qt6HeaderFixes(const std::string &name, ClazyContext *context);
+ void VisitInclusionDirective(clang::SourceLocation HashLoc, const clang::Token &IncludeTok, clang::StringRef FileName, bool IsAngled,
+- clang::CharSourceRange FilenameRange, const clang::FileEntry *File, clang::StringRef SearchPath,
++ clang::CharSourceRange FilenameRange, clazy::OptionalFileEntryRef File, clang::StringRef SearchPath,
+ clang::StringRef RelativePath, const clang::Module *Imported, clang::SrcMgr::CharacteristicKind FileType) override;
+
+ };
diff --git a/srcpkgs/clazy/template b/srcpkgs/clazy/template
index 11f3bab55aef..f81de08ab836 100644
--- a/srcpkgs/clazy/template
+++ b/srcpkgs/clazy/template
@@ -1,7 +1,7 @@
# Template file for 'clazy'
pkgname=clazy
version=1.11
-revision=1
+revision=2
build_style=cmake
build_helper=qemu
hostmakedepends="llvm"
From c1a8d0db09a0c9cea282445045f2d14f6a6ecbf5 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 16 Feb 2023 23:42:00 +0100
Subject: [PATCH 21/26] ldc: update to 1.31.0
---
common/shlibs | 8 +--
...4260a848c8ebad5582e27ac1e09627cdfb17.patch | 57 -------------------
srcpkgs/ldc/template | 6 +-
3 files changed, 7 insertions(+), 64 deletions(-)
delete mode 100644 srcpkgs/ldc/patches/54544260a848c8ebad5582e27ac1e09627cdfb17.patch
diff --git a/common/shlibs b/common/shlibs
index 517ef97d2260..e821b07d5434 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2196,10 +2196,10 @@ libFcitx5Config.so.6 libfcitx5-5.0.5_1
libFcitx5GClient.so.2 fcitx5-gtk-5.0.4_1
libFcitx5Qt5DBusAddons.so.1 fcitx5-qt5-5.0.3_1
libFcitx5Qt5WidgetsAddons.so.2 fcitx5-qt5-5.0.3_1
-libdruntime-ldc-debug-shared.so.100 ldc-runtime-1.30.0_1
-libdruntime-ldc-shared.so.100 ldc-runtime-1.30.0_1
-libphobos2-ldc-shared.so.100 ldc-runtime-1.30.0_1
-libphobos2-ldc-debug-shared.so.100 ldc-runtime-1.30.0_1
+libdruntime-ldc-debug-shared.so.101 ldc-runtime-1.31.0_1
+libdruntime-ldc-shared.so.101 ldc-runtime-1.31.0_1
+libphobos2-ldc-shared.so.101 ldc-runtime-1.31.0_1
+libphobos2-ldc-debug-shared.so.101 ldc-runtime-1.31.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/patches/54544260a848c8ebad5582e27ac1e09627cdfb17.patch b/srcpkgs/ldc/patches/54544260a848c8ebad5582e27ac1e09627cdfb17.patch
deleted file mode 100644
index 79694372bfaa..000000000000
--- a/srcpkgs/ldc/patches/54544260a848c8ebad5582e27ac1e09627cdfb17.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 54544260a848c8ebad5582e27ac1e09627cdfb17 Mon Sep 17 00:00:00 2001
-From: Razvan Nitu <razvan.nitu1305@gmail.com>
-Date: Wed, 24 Aug 2022 13:54:15 +0300
-Subject: [PATCH] Port the fix for issue 23157 (#14378)
-
----
- druntime/src/core/sys/posix/sys/socket.d | 36 ++++++++++++++++++++++--
- 1 file changed, 33 insertions(+), 3 deletions(-)
-
-diff --git a/druntime/src/core/sys/posix/sys/socket.d b/druntime/src/core/sys/posix/sys/socket.d
-index 3a7b753adff..fc5dc5d1684 100644
---- a/runtime/druntime/src/core/sys/posix/sys/socket.d
-+++ b/runtime/druntime/src/core/sys/posix/sys/socket.d
-@@ -188,10 +188,40 @@ version (linux)
-
- extern (D) inout(ubyte)* CMSG_DATA( return scope inout(cmsghdr)* cmsg ) pure nothrow @nogc { return cast(ubyte*)( cmsg + 1 ); }
-
-- private inout(cmsghdr)* __cmsg_nxthdr(inout(msghdr)*, inout(cmsghdr)*) pure nothrow @nogc;
-- extern (D) inout(cmsghdr)* CMSG_NXTHDR(inout(msghdr)* msg, inout(cmsghdr)* cmsg) pure nothrow @nogc
-+ version (CRuntime_Musl)
- {
-- return __cmsg_nxthdr(msg, cmsg);
-+ extern (D)
-+ {
-+ private size_t __CMSG_LEN(inout(cmsghdr)* cmsg) pure nothrow @nogc
-+ {
-+ return (cmsg.cmsg_len + size_t.sizeof -1) & cast(size_t)(~(size_t.sizeof - 1));
-+ }
-+
-+ private inout(cmsghdr)* __CMSG_NEXT(inout(cmsghdr)* cmsg) pure nothrow @nogc
-+ {
-+ return cmsg + __CMSG_LEN(cmsg);
-+ }
-+
-+ private inout(msghdr)* __MHDR_END(inout(msghdr)* mhdr) pure nothrow @nogc
-+ {
-+ return cast(inout(msghdr)*)(mhdr.msg_control + mhdr.msg_controllen);
-+ }
-+
-+ inout(cmsghdr)* CMSG_NXTHDR(inout(msghdr)* msg, inout(cmsghdr)* cmsg) pure nothrow @nogc
-+ {
-+ return cmsg.cmsg_len < cmsghdr.sizeof ||
-+ __CMSG_LEN(cmsg) + cmsghdr.sizeof >= __MHDR_END(msg) - cast(inout(msghdr)*)(cmsg)
-+ ? cast(inout(cmsghdr)*) null : cast(inout(cmsghdr)*) __CMSG_NEXT(cmsg);
-+ }
-+ }
-+ }
-+ else
-+ {
-+ private inout(cmsghdr)* __cmsg_nxthdr(inout(msghdr)*, inout(cmsghdr)*) pure nothrow @nogc;
-+ extern (D) inout(cmsghdr)* CMSG_NXTHDR(inout(msghdr)* msg, inout(cmsghdr)* cmsg) pure nothrow @nogc
-+ {
-+ return __cmsg_nxthdr(msg, cmsg);
-+ }
- }
-
- extern (D) inout(cmsghdr)* CMSG_FIRSTHDR( inout(msghdr)* mhdr ) pure nothrow @nogc
diff --git a/srcpkgs/ldc/template b/srcpkgs/ldc/template
index 99d22682ce7a..f6d8b7ffbe98 100644
--- a/srcpkgs/ldc/template
+++ b/srcpkgs/ldc/template
@@ -1,6 +1,6 @@
# Template file for 'ldc'
pkgname=ldc
-version=1.30.0
+version=1.31.0
revision=1
build_style=cmake
configure_args="
@@ -11,7 +11,7 @@ configure_args="
-DCOMPILE_D_MODULES_SEPARATELY=ON
-DC_SYSTEM_LIBS='unwind;m;pthread;rt;dl'"
conf_files="/etc/ldc2.conf"
-hostmakedepends="dmd llvm12 perl pkg-config"
+hostmakedepends="dmd llvm15 perl pkg-config"
makedepends="libcurl-devel libffi-devel ncurses-devel zlib-devel
llvm-libunwind-devel"
depends="ldc-runtime llvm-libunwind-devel"
@@ -22,7 +22,7 @@ license="BSD-3-Clause, BSL-1.0"
homepage="https://wiki.dlang.org/LDC"
changelog="https://raw.githubusercontent.com/ldc-developers/ldc/master/CHANGELOG.md"
distfiles="https://github.com/ldc-developers/ldc/releases/download/v${version}/ldc-${version}-src.tar.gz"
-checksum=fdbb376f08242d917922a6a22a773980217fafa310046fc5d6459490af23dacd
+checksum=f1c8ece9e1e35806c3441bf24fbe666cddd8eef375592c19cd8fee4701cd5458
nopie=yes
nocross="dmd compilation fails on cross"
# tests timeout on musl; also require unpackaged python3-lit
From c74059a40b8e32d869d196813cc0c170795007a0 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 16 Feb 2023 23:42:46 +0100
Subject: [PATCH 22/26] gtkd: rebuild for ldc 1.31
---
srcpkgs/gtkd/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/gtkd/template b/srcpkgs/gtkd/template
index e64a1f54fb96..6a75d69e19ce 100644
--- a/srcpkgs/gtkd/template
+++ b/srcpkgs/gtkd/template
@@ -1,7 +1,7 @@
# Template file for 'gtkd'
pkgname=gtkd
version=3.9.0
-revision=9
+revision=10
build_style=gnu-makefile
make_build_args="LDFLAGS='-linker=bfd' DC=ldc2"
make_build_target="shared-libs shared-gstreamer shared-vte shared-peas shared-gtkdgl"
From d0d172161d49a36a016174a635543af491e38da4 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Thu, 16 Feb 2023 23:43:29 +0100
Subject: [PATCH 23/26] onedrive: rebuild for ldc 1.31
---
srcpkgs/onedrive/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/onedrive/template b/srcpkgs/onedrive/template
index 28163f334552..63e4f43a7fbd 100644
--- a/srcpkgs/onedrive/template
+++ b/srcpkgs/onedrive/template
@@ -1,7 +1,7 @@
# Template file for 'onedrive'
pkgname=onedrive
version=2.4.13
-revision=4
+revision=5
build_style=gnu-configure
configure_args="DC=ldc2"
hostmakedepends="ldc pkg-config"
From 18bc113acc58b30669dc3b208b73039c00d0662b Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Sat, 18 Feb 2023 20:33:19 +0100
Subject: [PATCH 24/26] qtcreator: rebuild for llvm15
---
srcpkgs/qtcreator/template | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/srcpkgs/qtcreator/template b/srcpkgs/qtcreator/template
index 8eb1b7891f60..e8324b27077c 100644
--- a/srcpkgs/qtcreator/template
+++ b/srcpkgs/qtcreator/template
@@ -1,7 +1,7 @@
# Template file for 'qtcreator'
pkgname=qtcreator
version=9.0.1
-revision=1
+revision=2
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
From f77e3488e07a8679bf2b483f07209e4d20b86a74 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 22 Feb 2023 13:33:41 +0100
Subject: [PATCH 25/26] tilix: rebuild for ldc 1.31
---
srcpkgs/tilix/patches/undead.patch | 21 +++++++++++++++++++++
srcpkgs/tilix/template | 15 ++++++++++++---
2 files changed, 33 insertions(+), 3 deletions(-)
create mode 100644 srcpkgs/tilix/patches/undead.patch
diff --git a/srcpkgs/tilix/patches/undead.patch b/srcpkgs/tilix/patches/undead.patch
new file mode 100644
index 000000000000..3bc40d69f269
--- /dev/null
+++ b/srcpkgs/tilix/patches/undead.patch
@@ -0,0 +1,21 @@
+--- a/source/gx/tilix/prefeditor/prefdialog.d
++++ b/source/gx/tilix/prefeditor/prefdialog.d
+@@ -957,7 +957,7 @@ private:
+ return;
+ }
+
+- import std.xml: DocumentParser, ElementParser, Element, XMLException;
++ import undead.xml: DocumentParser, ElementParser, Element, XMLException;
+
+ try {
+ DocumentParser parser = new DocumentParser(ui);
+--- a/meson.build
++++ b/meson.build
+@@ -91,6 +91,7 @@ tilix_sources = [
+ 'source/secretc/secrettypes.d',
+ 'source/x11/X.d',
+ 'source/x11/Xlib.d',
++ 'source/undead/xml.d',
+ 'source/app.d'
+ ]
+
diff --git a/srcpkgs/tilix/template b/srcpkgs/tilix/template
index 5689948babaa..74ccb4dd4592 100644
--- a/srcpkgs/tilix/template
+++ b/srcpkgs/tilix/template
@@ -1,7 +1,9 @@
# Template file for 'tilix'
pkgname=tilix
version=1.9.4
-revision=6
+revision=7
+_undead_version=1.1.8
+build_wrksrc="${pkgname}-${version}"
build_style=meson
configure_args="-Db_lto=false"
hostmakedepends="automake gettext-devel gdk-pixbuf glib-devel ldc po4a pkg-config
@@ -13,8 +15,15 @@ short_desc="Tiling terminal emulator for Linux"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="MPL-2.0"
homepage="https://gnunn1.github.io/tilix-web/"
-distfiles="https://github.com/gnunn1/${pkgname}/archive/${version}.tar.gz"
-checksum=2a9482770391d11d5edc8351d426c700c2cc6c194a30391ef2ae25bb7095b59b
+distfiles="https://github.com/gnunn1/${pkgname}/archive/${version}.tar.gz
+ https://github.com/dlang/undeaD/archive/refs/tags/v${_undead_version}.tar.gz"
+checksum="2a9482770391d11d5edc8351d426c700c2cc6c194a30391ef2ae25bb7095b59b
+ 36a59b4740b147f4345caa26908f40a97fc7cc67dac6983c226369c59f909e92"
+patch_args="-d ${build_wrksrc} -Np1"
+
+post_extract() {
+ mv undeaD-${_undead_version}/src/undead ${build_wrksrc}/source/
+}
pre_configure() {
case "$XBPS_TARGET_MACHINE" in
From ef8d3aec15657b0abdad49dba9f658358938ae44 Mon Sep 17 00:00:00 2001
From: Marcin Puc <tranzystorek.io@protonmail.com>
Date: Wed, 1 Mar 2023 14:59:55 +0100
Subject: [PATCH 26/26] ispc: update to 1.19.0
---
srcpkgs/ispc/patches/cmake-build-type-none.patch | 13 +++++++++++++
srcpkgs/ispc/template | 12 ++++--------
2 files changed, 17 insertions(+), 8 deletions(-)
create mode 100644 srcpkgs/ispc/patches/cmake-build-type-none.patch
diff --git a/srcpkgs/ispc/patches/cmake-build-type-none.patch b/srcpkgs/ispc/patches/cmake-build-type-none.patch
new file mode 100644
index 000000000000..a962619d9335
--- /dev/null
+++ b/srcpkgs/ispc/patches/cmake-build-type-none.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index c694166..405dc90 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -199,7 +199,7 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin )
+
+ if(CMAKE_BUILD_TYPE)
+ # Validate build type
+- set(CONFIGURATION_TYPES "Debug;Release;RelWithDebInfo")
++ set(CONFIGURATION_TYPES "Debug;Release;RelWithDebInfo;None")
+
+ string(FIND "${CONFIGURATION_TYPES}" "${CMAKE_BUILD_TYPE}" MATCHED_CONFIG)
+ if (${MATCHED_CONFIG} EQUAL -1)
diff --git a/srcpkgs/ispc/template b/srcpkgs/ispc/template
index 2b06217d0aab..574a75bab7e6 100644
--- a/srcpkgs/ispc/template
+++ b/srcpkgs/ispc/template
@@ -1,18 +1,18 @@
# Template file for 'ispc'
pkgname=ispc
-version=1.18.1
+version=1.19.0
revision=1
archs="x86_64*"
build_style=cmake
-configure_args="-DISPC_NO_DUMPS=ON -DARM_ENABLED=OFF -DCMAKE_BUILD_TYPE=Release"
+configure_args="-DARM_ENABLED=OFF -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 libomp-devel"
+makedepends="ncurses-devel ncurses-libtinfo-devel zlib-devel"
short_desc="Compiler for high-performance SIMD programming on the CPU"
maintainer="Andrea Brancaleoni <abc@pompel.me>"
license="BSD-3-Clause"
homepage="https://ispc.github.io"
distfiles="https://github.com/ispc/ispc/archive/v${version}.tar.gz"
-checksum=5b004c121e7a39c8654bb61930a240e4bd3e432a80d851c6281fae49f9aca7b7
+checksum=da1eccb8ead495b22d642340f3bab11fb64dd2223cd9cc92f0492f70b30f34b5
nocross=yes
nopie=yes
@@ -21,10 +21,6 @@ case "$XBPS_TARGET_MACHINE" in
x86_64) hostmakedepends+=" gcc-multilib";;
esac
-pre_build() {
- sed -i '/tinfo/d' CMakeLists.txt
-}
-
post_install() {
vlicense LICENSE.txt
}
next prev parent reply other threads:[~2023-03-18 16:35 UTC|newest]
Thread overview: 96+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-28 15:30 [PR PATCH] [WIP] " tranzystorek-io
2022-11-28 15:32 ` tranzystorek-io
2022-11-28 16:36 ` dkwo
2022-11-28 19:13 ` [PR PATCH] [Updated] " tranzystorek-io
2022-11-28 23:49 ` tranzystorek-io
2022-11-29 0:31 ` tranzystorek-io
2022-12-05 8:05 ` tranzystorek-io
2022-12-05 8:17 ` tranzystorek-io
2022-12-05 8:22 ` [PR REVIEW] " oreo639
2022-12-05 8:22 ` oreo639
2022-12-05 8:29 ` oreo639
2022-12-05 8:29 ` oreo639
2022-12-05 8:30 ` oreo639
2022-12-05 8:39 ` oreo639
2022-12-05 9:28 ` oreo639
2022-12-05 9:55 ` oreo639
2022-12-05 9:55 ` oreo639
2022-12-06 10:11 ` [PR PATCH] [Updated] " tranzystorek-io
2022-12-07 5:04 ` Vaelatern
2022-12-07 5:04 ` Vaelatern
2022-12-12 18:26 ` [PR PATCH] [Updated] " tranzystorek-io
2022-12-17 8:56 ` tranzystorek-io
2022-12-17 9:00 ` tranzystorek-io
2022-12-17 9:09 ` tranzystorek-io
2022-12-17 10:44 ` [PR REVIEW] " paper42
2022-12-17 23:41 ` [PR PATCH] [Updated] " tranzystorek-io
2022-12-18 0:02 ` [PR REVIEW] " oreo639
2022-12-18 0:03 ` oreo639
2022-12-18 0:05 ` oreo639
2022-12-18 11:24 ` [PR PATCH] [Updated] " tranzystorek-io
2022-12-18 23:30 ` tranzystorek-io
2022-12-19 23:58 ` oreo639
2022-12-19 23:59 ` oreo639
2022-12-20 0:04 ` oreo639
2022-12-20 0:09 ` oreo639
2022-12-22 4:26 ` simvux
2022-12-22 4:48 ` oreo639
2022-12-22 10:15 ` ardadem
2023-01-05 14:13 ` [PR PATCH] [Updated] " tranzystorek-io
2023-01-06 12:39 ` [PR REVIEW] " tranzystorek-io
2023-01-06 12:56 ` [PR PATCH] [Updated] " tranzystorek-io
2023-01-06 16:15 ` tranzystorek-io
2023-01-07 10:31 ` tranzystorek-io
2023-01-07 17:02 ` tranzystorek-io
2023-01-09 0:22 ` tranzystorek-io
2023-01-09 0:58 ` tranzystorek-io
2023-01-10 8:20 ` dkwo
2023-01-12 18:46 ` [PR PATCH] [Updated] " tranzystorek-io
2023-01-14 22:16 ` Johnnynator
2023-01-15 1:46 ` [PR PATCH] [Updated] " tranzystorek-io
2023-01-16 13:45 ` tranzystorek-io
2023-01-17 19:01 ` [PR REVIEW] " Johnnynator
2023-01-24 13:05 ` [PR PATCH] [Updated] " tranzystorek-io
2023-01-24 13:15 ` tranzystorek-io
2023-01-26 22:36 ` tranzystorek-io
2023-02-01 12:34 ` tranzystorek-io
2023-02-05 12:42 ` tranzystorek-io
2023-02-05 13:58 ` tranzystorek-io
2023-02-07 9:14 ` tranzystorek-io
2023-02-10 14:20 ` tranzystorek-io
2023-02-10 14:49 ` oreo639
2023-02-10 14:50 ` oreo639
2023-02-10 14:51 ` oreo639
2023-02-10 14:51 ` oreo639
2023-02-10 14:55 ` oreo639
2023-02-10 16:26 ` [PR PATCH] [Updated] " tranzystorek-io
2023-02-10 16:42 ` tranzystorek-io
2023-02-10 19:21 ` tranzystorek-io
2023-02-15 17:27 ` tranzystorek-io
2023-02-16 19:17 ` tranzystorek-io
2023-02-16 22:44 ` tranzystorek-io
2023-02-18 19:34 ` tranzystorek-io
2023-02-19 22:34 ` simvux
2023-02-20 9:59 ` cmueller-tp
2023-02-22 12:35 ` [PR PATCH] [Updated] " tranzystorek-io
2023-02-22 14:35 ` tranzystorek-io
2023-02-22 19:26 ` tranzystorek-io
2023-02-22 19:41 ` [PR PATCH] [Updated] " tranzystorek-io
2023-02-24 22:55 ` Johnnynator
2023-03-01 14:02 ` [PR PATCH] [Updated] " tranzystorek-io
2023-03-10 14:35 ` tranzystorek-io
2023-03-13 14:25 ` motorto
2023-03-13 14:27 ` tranzystorek-io
2023-03-18 3:31 ` ihameed
2023-03-18 3:39 ` ihameed
2023-03-18 4:46 ` ihameed
2023-03-18 9:35 ` [PR PATCH] [Updated] " tranzystorek-io
2023-03-18 16:35 ` tranzystorek-io [this message]
2023-03-25 6:04 ` oreo639
2023-03-25 13:04 ` [PR PATCH] [Updated] " tranzystorek-io
2023-03-25 13:10 ` tranzystorek-io
2023-03-30 22:02 ` tranzystorek-io
2023-03-31 13:28 ` [PR PATCH] [Closed]: " leahneukirchen
2023-04-02 12:17 ` simvux
2023-04-02 12:18 ` tranzystorek-io
2023-04-02 12:19 ` simvux
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230318163546.S7KGOXK-WYEuUCGohn-uj8dLFyOvHPlqbyfzKKajPVQ@z \
--to=tranzystorek-io@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).