Github messages for voidlinux
 help / color / mirror / Atom feed
From: Calandracas606 <Calandracas606@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] New package: llvm17
Date: Thu, 01 Feb 2024 04:41:53 +0100	[thread overview]
Message-ID: <20240201034153.3E26622229@inbox.vuxu.org> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-46935@inbox.vuxu.org>

[-- Attachment #1: Type: text/plain, Size: 1178 bytes --]

There is an updated pull request by Calandracas606 against master on the void-packages repository

https://github.com/Calandracas606/void-packages llvm17
https://github.com/void-linux/void-packages/pull/46935

New package: llvm17
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->

#### Local build testing
- I built this PR locally for my native architecture, x86_64-musl
Additional builds:
- x86_64
- aarch64-musl (cross)
- i686
- armv6l-musl

[ci skip]

A patch file from https://github.com/void-linux/void-packages/pull/46935.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-llvm17-46935.patch --]
[-- Type: text/x-diff, Size: 131552 bytes --]

From 601580dd22769d7a735147c52c45f035784102cb Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Thu, 2 Nov 2023 23:10:07 -0400
Subject: [PATCH 01/44] New package: llvm17

---
 common/shlibs                                 |  17 +-
 srcpkgs/clang                                 |   2 +-
 srcpkgs/clang-analyzer                        |   2 +-
 srcpkgs/clang-analyzer15                      |   1 +
 srcpkgs/clang-devel                           |   1 +
 srcpkgs/clang-tools-extra                     |   2 +-
 srcpkgs/clang-tools-extra15                   |   1 +
 srcpkgs/clang15                               |   1 +
 srcpkgs/clang17                               |   1 +
 srcpkgs/flang                                 |   1 +
 srcpkgs/flang-devel                           |   1 +
 srcpkgs/libclang                              |   2 +-
 srcpkgs/libclang-cpp                          |   2 +-
 srcpkgs/libclang-cpp15                        |   1 +
 srcpkgs/libclang15                            |   1 +
 srcpkgs/libcxx                                |   2 +-
 srcpkgs/libcxx-devel                          |   2 +-
 srcpkgs/libcxx15                              |   1 +
 srcpkgs/libcxx15-devel                        |   1 +
 srcpkgs/libcxxabi                             |   2 +-
 srcpkgs/libcxxabi-devel                       |   2 +-
 srcpkgs/libcxxabi15                           |   1 +
 srcpkgs/libcxxabi15-devel                     |   1 +
 srcpkgs/libllvm                               |   1 +
 srcpkgs/libomp                                |   2 +-
 srcpkgs/libomp-devel                          |   2 +-
 srcpkgs/libomp15                              |   1 +
 srcpkgs/libomp15-devel                        |   1 +
 srcpkgs/lld                                   |   2 +-
 srcpkgs/lld-devel                             |   2 +-
 srcpkgs/lld15                                 |   1 +
 srcpkgs/lld15-devel                           |   1 +
 srcpkgs/lldb                                  |   2 +-
 srcpkgs/lldb-devel                            |   2 +-
 srcpkgs/lldb15                                |   1 +
 srcpkgs/lldb15-devel                          |   1 +
 srcpkgs/llvm-bolt                             |   1 +
 srcpkgs/llvm-devel                            |   1 +
 srcpkgs/llvm-libunwind                        |   2 +-
 srcpkgs/llvm-libunwind-devel                  |   2 +-
 srcpkgs/llvm-libunwind15                      |   1 +
 srcpkgs/llvm-libunwind15-devel                |   1 +
 srcpkgs/llvm/template                         |   6 +-
 srcpkgs/llvm15/template                       |  75 +-
 .../llvm17/files/llvm-Config-llvm-config.h    |   9 +
 srcpkgs/llvm17/patches/SmallVector.patch      |  13 +
 ...clang-001-fix-unwind-chain-inclusion.patch |  44 +
 .../patches/clang-002-add-musl-triples.patch  | 115 +++
 .../clang-003-ppc64-dynamic-linker-path.patch |  13 +
 .../compiler-rt-sanitizer-ppc64-musl.patch    |  37 +
 ...compiler-rt-sanitizer-supported-arch.patch |  22 +
 srcpkgs/llvm17/patches/libcxx-armv67.patch    |  35 +
 srcpkgs/llvm17/patches/libcxx-musl.patch      |  27 +
 .../llvm17/patches/libcxx-ssp-nonshared.patch |  11 +
 srcpkgs/llvm17/patches/libcxxabi-dl.patch     |  25 +
 srcpkgs/llvm17/patches/libomp-soname.patch    |  12 +
 srcpkgs/llvm17/patches/llvm-001-musl.patch    |  44 +
 .../patches/llvm-004-override-opt.patch       |  18 +
 .../llvm17/patches/llvm-005-ppc-bigpic.patch  |  36 +
 .../patches/llvm-006-aarch64-mf_exec.patch    |  24 +
 srcpkgs/llvm17/template                       | 817 ++++++++++++++++++
 srcpkgs/llvm17/update                         |   3 +
 srcpkgs/mlir                                  |   1 +
 srcpkgs/mlir-devel                            |   1 +
 64 files changed, 1398 insertions(+), 65 deletions(-)
 create mode 120000 srcpkgs/clang-analyzer15
 create mode 120000 srcpkgs/clang-devel
 create mode 120000 srcpkgs/clang-tools-extra15
 create mode 120000 srcpkgs/clang15
 create mode 120000 srcpkgs/clang17
 create mode 120000 srcpkgs/flang
 create mode 120000 srcpkgs/flang-devel
 create mode 120000 srcpkgs/libclang-cpp15
 create mode 120000 srcpkgs/libclang15
 create mode 120000 srcpkgs/libcxx15
 create mode 120000 srcpkgs/libcxx15-devel
 create mode 120000 srcpkgs/libcxxabi15
 create mode 120000 srcpkgs/libcxxabi15-devel
 create mode 120000 srcpkgs/libllvm
 create mode 120000 srcpkgs/libomp15
 create mode 120000 srcpkgs/libomp15-devel
 create mode 120000 srcpkgs/lld15
 create mode 120000 srcpkgs/lld15-devel
 create mode 120000 srcpkgs/lldb15
 create mode 120000 srcpkgs/lldb15-devel
 create mode 120000 srcpkgs/llvm-bolt
 create mode 120000 srcpkgs/llvm-devel
 create mode 120000 srcpkgs/llvm-libunwind15
 create mode 120000 srcpkgs/llvm-libunwind15-devel
 create mode 100644 srcpkgs/llvm17/files/llvm-Config-llvm-config.h
 create mode 100644 srcpkgs/llvm17/patches/SmallVector.patch
 create mode 100644 srcpkgs/llvm17/patches/clang-001-fix-unwind-chain-inclusion.patch
 create mode 100644 srcpkgs/llvm17/patches/clang-002-add-musl-triples.patch
 create mode 100644 srcpkgs/llvm17/patches/clang-003-ppc64-dynamic-linker-path.patch
 create mode 100644 srcpkgs/llvm17/patches/compiler-rt-sanitizer-ppc64-musl.patch
 create mode 100644 srcpkgs/llvm17/patches/compiler-rt-sanitizer-supported-arch.patch
 create mode 100644 srcpkgs/llvm17/patches/libcxx-armv67.patch
 create mode 100644 srcpkgs/llvm17/patches/libcxx-musl.patch
 create mode 100644 srcpkgs/llvm17/patches/libcxx-ssp-nonshared.patch
 create mode 100644 srcpkgs/llvm17/patches/libcxxabi-dl.patch
 create mode 100644 srcpkgs/llvm17/patches/libomp-soname.patch
 create mode 100644 srcpkgs/llvm17/patches/llvm-001-musl.patch
 create mode 100644 srcpkgs/llvm17/patches/llvm-004-override-opt.patch
 create mode 100644 srcpkgs/llvm17/patches/llvm-005-ppc-bigpic.patch
 create mode 100644 srcpkgs/llvm17/patches/llvm-006-aarch64-mf_exec.patch
 create mode 100644 srcpkgs/llvm17/template
 create mode 100644 srcpkgs/llvm17/update
 create mode 120000 srcpkgs/mlir
 create mode 120000 srcpkgs/mlir-devel

diff --git a/common/shlibs b/common/shlibs
index 71f172740e5c6..26204361d967e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -982,15 +982,20 @@ libuchardet.so.0 uchardet-0.0.6_1
 libgtksourceviewmm-3.0.so.0 gtksourceviewmm-3.2.0_1
 libyajl.so.2 yajl-2.0.1_1
 libconfuse.so.2 confuse-3.2.1_1
-liblldb.so.15 lldb-15.0.7_1
-libclang.so.15 libclang-15.0.7_1
-libclang-cpp.so.15 libclang-cpp-15.0.7_1
+liblldb.so.17 lldb-17.0.6_1
+liblldb.so.15 lldb15-15.0.7_4
+libclang.so.17 libclang-17.0.6_1
+libclang.so.15 libclang15-15.0.7_4
+libclang-cpp.so.17 libclang-cpp-17.0.6_1
+libclang-cpp.so.15 libclang-cpp15-15.0.7_4
 libLLVM-11.so libllvm11-11.0.0_1
 libLLVM-12.so libllvm12-12.0.0_1
-libLLVM-15.so libllvm15-15.0.7_1
+libLLVM-15.so libllvm15-15.0.7_4
+libLLVM-17.so libllvm-17.0.3_1
 libLLVMSPIRVLib.so.15 SPIRV-LLVM-Translator-15.0.0_1
-libomp.so.5 libomp-15.0.7_1
-libomptarget.so.15 libomp-15.0.7_1
+libomp.so.5 libomp-17.0.6_1
+libomptarget.so.15 libomp15-15.0.7_4
+libomptarget.so.17 libomp-17.0.3_1
 libisofs.so.6 libisofs-0.6.24_1
 libmpack.so.0 libmpack-1.0.5_1
 libGeoIP.so.1 libgeoip-1.4.8_1
diff --git a/srcpkgs/clang b/srcpkgs/clang
index ad57a969b9f9c..96970d5c02c13 120000
--- a/srcpkgs/clang
+++ b/srcpkgs/clang
@@ -1 +1 @@
-llvm15
\ No newline at end of file
+llvm17
\ No newline at end of file
diff --git a/srcpkgs/clang-analyzer b/srcpkgs/clang-analyzer
index ad57a969b9f9c..96970d5c02c13 120000
--- a/srcpkgs/clang-analyzer
+++ b/srcpkgs/clang-analyzer
@@ -1 +1 @@
-llvm15
\ No newline at end of file
+llvm17
\ No newline at end of file
diff --git a/srcpkgs/clang-analyzer15 b/srcpkgs/clang-analyzer15
new file mode 120000
index 0000000000000..ad57a969b9f9c
--- /dev/null
+++ b/srcpkgs/clang-analyzer15
@@ -0,0 +1 @@
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/clang-devel b/srcpkgs/clang-devel
new file mode 120000
index 0000000000000..96970d5c02c13
--- /dev/null
+++ b/srcpkgs/clang-devel
@@ -0,0 +1 @@
+llvm17
\ No newline at end of file
diff --git a/srcpkgs/clang-tools-extra b/srcpkgs/clang-tools-extra
index ad57a969b9f9c..96970d5c02c13 120000
--- a/srcpkgs/clang-tools-extra
+++ b/srcpkgs/clang-tools-extra
@@ -1 +1 @@
-llvm15
\ No newline at end of file
+llvm17
\ No newline at end of file
diff --git a/srcpkgs/clang-tools-extra15 b/srcpkgs/clang-tools-extra15
new file mode 120000
index 0000000000000..ad57a969b9f9c
--- /dev/null
+++ b/srcpkgs/clang-tools-extra15
@@ -0,0 +1 @@
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/clang15 b/srcpkgs/clang15
new file mode 120000
index 0000000000000..ad57a969b9f9c
--- /dev/null
+++ b/srcpkgs/clang15
@@ -0,0 +1 @@
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/clang17 b/srcpkgs/clang17
new file mode 120000
index 0000000000000..96970d5c02c13
--- /dev/null
+++ b/srcpkgs/clang17
@@ -0,0 +1 @@
+llvm17
\ No newline at end of file
diff --git a/srcpkgs/flang b/srcpkgs/flang
new file mode 120000
index 0000000000000..96970d5c02c13
--- /dev/null
+++ b/srcpkgs/flang
@@ -0,0 +1 @@
+llvm17
\ No newline at end of file
diff --git a/srcpkgs/flang-devel b/srcpkgs/flang-devel
new file mode 120000
index 0000000000000..96970d5c02c13
--- /dev/null
+++ b/srcpkgs/flang-devel
@@ -0,0 +1 @@
+llvm17
\ No newline at end of file
diff --git a/srcpkgs/libclang b/srcpkgs/libclang
index ad57a969b9f9c..96970d5c02c13 120000
--- a/srcpkgs/libclang
+++ b/srcpkgs/libclang
@@ -1 +1 @@
-llvm15
\ No newline at end of file
+llvm17
\ No newline at end of file
diff --git a/srcpkgs/libclang-cpp b/srcpkgs/libclang-cpp
index ad57a969b9f9c..96970d5c02c13 120000
--- a/srcpkgs/libclang-cpp
+++ b/srcpkgs/libclang-cpp
@@ -1 +1 @@
-llvm15
\ No newline at end of file
+llvm17
\ No newline at end of file
diff --git a/srcpkgs/libclang-cpp15 b/srcpkgs/libclang-cpp15
new file mode 120000
index 0000000000000..ad57a969b9f9c
--- /dev/null
+++ b/srcpkgs/libclang-cpp15
@@ -0,0 +1 @@
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/libclang15 b/srcpkgs/libclang15
new file mode 120000
index 0000000000000..ad57a969b9f9c
--- /dev/null
+++ b/srcpkgs/libclang15
@@ -0,0 +1 @@
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/libcxx b/srcpkgs/libcxx
index ad57a969b9f9c..96970d5c02c13 120000
--- a/srcpkgs/libcxx
+++ b/srcpkgs/libcxx
@@ -1 +1 @@
-llvm15
\ No newline at end of file
+llvm17
\ No newline at end of file
diff --git a/srcpkgs/libcxx-devel b/srcpkgs/libcxx-devel
index ad57a969b9f9c..96970d5c02c13 120000
--- a/srcpkgs/libcxx-devel
+++ b/srcpkgs/libcxx-devel
@@ -1 +1 @@
-llvm15
\ No newline at end of file
+llvm17
\ No newline at end of file
diff --git a/srcpkgs/libcxx15 b/srcpkgs/libcxx15
new file mode 120000
index 0000000000000..ad57a969b9f9c
--- /dev/null
+++ b/srcpkgs/libcxx15
@@ -0,0 +1 @@
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/libcxx15-devel b/srcpkgs/libcxx15-devel
new file mode 120000
index 0000000000000..ad57a969b9f9c
--- /dev/null
+++ b/srcpkgs/libcxx15-devel
@@ -0,0 +1 @@
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/libcxxabi b/srcpkgs/libcxxabi
index ad57a969b9f9c..96970d5c02c13 120000
--- a/srcpkgs/libcxxabi
+++ b/srcpkgs/libcxxabi
@@ -1 +1 @@
-llvm15
\ No newline at end of file
+llvm17
\ No newline at end of file
diff --git a/srcpkgs/libcxxabi-devel b/srcpkgs/libcxxabi-devel
index ad57a969b9f9c..96970d5c02c13 120000
--- a/srcpkgs/libcxxabi-devel
+++ b/srcpkgs/libcxxabi-devel
@@ -1 +1 @@
-llvm15
\ No newline at end of file
+llvm17
\ No newline at end of file
diff --git a/srcpkgs/libcxxabi15 b/srcpkgs/libcxxabi15
new file mode 120000
index 0000000000000..ad57a969b9f9c
--- /dev/null
+++ b/srcpkgs/libcxxabi15
@@ -0,0 +1 @@
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/libcxxabi15-devel b/srcpkgs/libcxxabi15-devel
new file mode 120000
index 0000000000000..ad57a969b9f9c
--- /dev/null
+++ b/srcpkgs/libcxxabi15-devel
@@ -0,0 +1 @@
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/libllvm b/srcpkgs/libllvm
new file mode 120000
index 0000000000000..96970d5c02c13
--- /dev/null
+++ b/srcpkgs/libllvm
@@ -0,0 +1 @@
+llvm17
\ No newline at end of file
diff --git a/srcpkgs/libomp b/srcpkgs/libomp
index ad57a969b9f9c..96970d5c02c13 120000
--- a/srcpkgs/libomp
+++ b/srcpkgs/libomp
@@ -1 +1 @@
-llvm15
\ No newline at end of file
+llvm17
\ No newline at end of file
diff --git a/srcpkgs/libomp-devel b/srcpkgs/libomp-devel
index ad57a969b9f9c..96970d5c02c13 120000
--- a/srcpkgs/libomp-devel
+++ b/srcpkgs/libomp-devel
@@ -1 +1 @@
-llvm15
\ No newline at end of file
+llvm17
\ No newline at end of file
diff --git a/srcpkgs/libomp15 b/srcpkgs/libomp15
new file mode 120000
index 0000000000000..ad57a969b9f9c
--- /dev/null
+++ b/srcpkgs/libomp15
@@ -0,0 +1 @@
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/libomp15-devel b/srcpkgs/libomp15-devel
new file mode 120000
index 0000000000000..ad57a969b9f9c
--- /dev/null
+++ b/srcpkgs/libomp15-devel
@@ -0,0 +1 @@
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/lld b/srcpkgs/lld
index ad57a969b9f9c..96970d5c02c13 120000
--- a/srcpkgs/lld
+++ b/srcpkgs/lld
@@ -1 +1 @@
-llvm15
\ No newline at end of file
+llvm17
\ No newline at end of file
diff --git a/srcpkgs/lld-devel b/srcpkgs/lld-devel
index ad57a969b9f9c..96970d5c02c13 120000
--- a/srcpkgs/lld-devel
+++ b/srcpkgs/lld-devel
@@ -1 +1 @@
-llvm15
\ No newline at end of file
+llvm17
\ No newline at end of file
diff --git a/srcpkgs/lld15 b/srcpkgs/lld15
new file mode 120000
index 0000000000000..ad57a969b9f9c
--- /dev/null
+++ b/srcpkgs/lld15
@@ -0,0 +1 @@
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/lld15-devel b/srcpkgs/lld15-devel
new file mode 120000
index 0000000000000..ad57a969b9f9c
--- /dev/null
+++ b/srcpkgs/lld15-devel
@@ -0,0 +1 @@
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/lldb b/srcpkgs/lldb
index ad57a969b9f9c..96970d5c02c13 120000
--- a/srcpkgs/lldb
+++ b/srcpkgs/lldb
@@ -1 +1 @@
-llvm15
\ No newline at end of file
+llvm17
\ No newline at end of file
diff --git a/srcpkgs/lldb-devel b/srcpkgs/lldb-devel
index ad57a969b9f9c..96970d5c02c13 120000
--- a/srcpkgs/lldb-devel
+++ b/srcpkgs/lldb-devel
@@ -1 +1 @@
-llvm15
\ No newline at end of file
+llvm17
\ No newline at end of file
diff --git a/srcpkgs/lldb15 b/srcpkgs/lldb15
new file mode 120000
index 0000000000000..ad57a969b9f9c
--- /dev/null
+++ b/srcpkgs/lldb15
@@ -0,0 +1 @@
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/lldb15-devel b/srcpkgs/lldb15-devel
new file mode 120000
index 0000000000000..ad57a969b9f9c
--- /dev/null
+++ b/srcpkgs/lldb15-devel
@@ -0,0 +1 @@
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/llvm-bolt b/srcpkgs/llvm-bolt
new file mode 120000
index 0000000000000..96970d5c02c13
--- /dev/null
+++ b/srcpkgs/llvm-bolt
@@ -0,0 +1 @@
+llvm17
\ No newline at end of file
diff --git a/srcpkgs/llvm-devel b/srcpkgs/llvm-devel
new file mode 120000
index 0000000000000..96970d5c02c13
--- /dev/null
+++ b/srcpkgs/llvm-devel
@@ -0,0 +1 @@
+llvm17
\ No newline at end of file
diff --git a/srcpkgs/llvm-libunwind b/srcpkgs/llvm-libunwind
index ad57a969b9f9c..96970d5c02c13 120000
--- a/srcpkgs/llvm-libunwind
+++ b/srcpkgs/llvm-libunwind
@@ -1 +1 @@
-llvm15
\ No newline at end of file
+llvm17
\ No newline at end of file
diff --git a/srcpkgs/llvm-libunwind-devel b/srcpkgs/llvm-libunwind-devel
index ad57a969b9f9c..96970d5c02c13 120000
--- a/srcpkgs/llvm-libunwind-devel
+++ b/srcpkgs/llvm-libunwind-devel
@@ -1 +1 @@
-llvm15
\ No newline at end of file
+llvm17
\ No newline at end of file
diff --git a/srcpkgs/llvm-libunwind15 b/srcpkgs/llvm-libunwind15
new file mode 120000
index 0000000000000..ad57a969b9f9c
--- /dev/null
+++ b/srcpkgs/llvm-libunwind15
@@ -0,0 +1 @@
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/llvm-libunwind15-devel b/srcpkgs/llvm-libunwind15-devel
new file mode 120000
index 0000000000000..ad57a969b9f9c
--- /dev/null
+++ b/srcpkgs/llvm-libunwind15-devel
@@ -0,0 +1 @@
+llvm15
\ No newline at end of file
diff --git a/srcpkgs/llvm/template b/srcpkgs/llvm/template
index fc1c850bd26fd..24fcd5123cc53 100644
--- a/srcpkgs/llvm/template
+++ b/srcpkgs/llvm/template
@@ -1,11 +1,11 @@
 # Template file for 'llvm'
 pkgname=llvm
-version=15
+version=17
 revision=1
 build_style=meta
-depends="llvm15"
+depends="llvm17"
 short_desc="LLVM meta package"
 maintainer="Enno Boland <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"
+replaces="llvm15>=0 llvm12>=0 llvm11>=0 llvm10>=0 llvm9>=0 llvm8>=0 llvm7>=0 llvm6.0>=0 llvm3.9>=0"
diff --git a/srcpkgs/llvm15/template b/srcpkgs/llvm15/template
index 24f73810c3aa5..bdd9b40ef82e7 100644
--- a/srcpkgs/llvm15/template
+++ b/srcpkgs/llvm15/template
@@ -1,7 +1,7 @@
 # Template file for 'llvm15'
 pkgname=llvm15
 version=15.0.7
-revision=3
+revision=4
 build_wrksrc=llvm
 build_style=cmake
 _ext_suffix=".cpython-${py3_ver/./}-linux-${XBPS_TARGET_LIBC/glibc/gnu}.so"
@@ -34,8 +34,8 @@ hostmakedepends="perl python3 zlib-devel libffi-devel swig python3-Sphinx
 makedepends="python3-devel zlib-devel elfutils-devel libffi-devel libedit-devel
  libxml2-devel binutils-devel"
 depends="libllvm15>=${version}_${revision}"
-short_desc="Low Level Virtual Machine"
-maintainer="Orphaned <orphan@voidlinux.org>"
+short_desc="LLVM Compiler Infrastructure Project - Version 15"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
 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"
@@ -68,12 +68,12 @@ case "$XBPS_TARGET_MACHINE" in
 	x86_64*|aarch64*|ppc64*) _libomp_enable=yes;;
 esac
 
-subpackages="clang-tools-extra"
+subpackages="clang-tools-extra15"
 
 # must go before clang
 if [ "$_libomp_enable" = "yes" ]; then
 	_enabled_projects+=";openmp"
-	subpackages+=" libomp libomp-devel"
+	subpackages+=" libomp15 libomp15-devel"
 	# because of cmake nonsense referencing libomptarget.so.*
 	depends+=" libomp>=${version}_${revision}"
 	if [ "$CROSS_BUILD" ]; then
@@ -83,17 +83,17 @@ if [ "$_libomp_enable" = "yes" ]; then
 	fi
 fi
 
-subpackages+=" clang clang-analyzer libclang libclang-cpp
- llvm-libunwind llvm-libunwind-devel libcxx libcxx-devel
- libcxxabi libcxxabi-devel libllvm15"
+subpackages+=" clang15 clang-analyzer15 libclang15 libclang-cpp15
+ llvm-libunwind15 llvm-libunwind15-devel libcxx15 libcxx15-devel
+ libcxxabi15 libcxxabi15-devel libllvm15"
 
 if [ "$_lldb_enable" = "yes" ]; then
 	# XXX fails to cross compile due to python
 	_enabled_projects+=";lldb"
-	subpackages+=" lldb lldb-devel"
+	subpackages+=" lldb15 lldb15-devel"
 fi
 
-subpackages+=" lld lld-devel"
+subpackages+=" lld15 lld15-devel"
 
 configure_args+=" -DLLVM_ENABLE_PROJECTS=${_enabled_projects}"
 
@@ -224,9 +224,9 @@ do_install() {
 		644 usr/include/mach-o
 }
 
-clang-analyzer_package() {
+clang-analyzer15_package() {
 	pycompile_dirs="usr/share/scan-view"
-	depends="clang-${version}_${revision} python3 perl"
+	depends="clang15-${version}_${revision} python3 perl"
 	short_desc+=" - A source code analysis framework"
 	homepage="https://clang-analyzer.llvm.org/"
 	pkg_install() {
@@ -237,9 +237,9 @@ clang-analyzer_package() {
 	}
 }
 
-clang-tools-extra_package() {
+clang-tools-extra15_package() {
 	lib32disabled=yes
-	depends="clang-${version}_${revision} python3"
+	depends="clang15-${version}_${revision} python3"
 	short_desc+=" - Extra Clang tools"
 	homepage="https://clang.llvm.org/extra/"
 	pkg_install() {
@@ -279,10 +279,10 @@ clang-tools-extra_package() {
 	}
 }
 
-clang_package() {
+clang15_package() {
 	lib32disabled=yes
 	depends="libstdc++-devel libgcc-devel  binutils ${XBPS_TARGET_LIBC}-devel
-	 libclang-${version}_${revision}"
+	 libclang15-${version}_${revision}"
 	short_desc+=" - C language family frontend"
 	homepage="https://clang.llvm.org/"
 	pkg_install() {
@@ -302,21 +302,21 @@ clang_package() {
 	}
 }
 
-libclang_package() {
+libclang15_package() {
 	short_desc+=" - C frontend runtime library"
 	pkg_install() {
 		vmove "usr/lib/libclang.so.*"
 	}
 }
 
-libclang-cpp_package() {
+libclang-cpp15_package() {
 	short_desc+=" - C frontend runtime library (C++ interface)"
 	pkg_install() {
 		vmove "usr/lib/libclang-cpp.so.*"
 	}
 }
 
-lld_package() {
+lld15_package() {
 	lib32disabled=yes
 	short_desc+=" - linker"
 	homepage="https://lld.llvm.org"
@@ -329,11 +329,11 @@ lld_package() {
 	}
 }
 
-lld-devel_package() {
+lld15-devel_package() {
 	lib32disabled=yes
 	short_desc+=" - linker - development files"
 	homepage="https://lld.llvm.org"
-	depends="lld>=${version}_${revision}"
+	depends="lld15>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include/lld
 		vmove usr/lib/cmake/lld
@@ -341,7 +341,7 @@ lld-devel_package() {
 	}
 }
 
-lldb_package() {
+lldb15_package() {
 	lib32disabled=yes
 	depends+=" python3-six"
 	short_desc+=" - LLDB debugger"
@@ -353,9 +353,9 @@ lldb_package() {
 	}
 }
 
-lldb-devel_package() {
+lldb15-devel_package() {
 	lib32disabled=yes
-	depends="lldb>=${version}_${revision}"
+	depends="lldb15>=${version}_${revision}"
 	short_desc+=" - LLDB debugger - development files"
 	pkg_install() {
 		vmove usr/include/lldb
@@ -363,16 +363,16 @@ lldb-devel_package() {
 	}
 }
 
-llvm-libunwind_package() {
+llvm-libunwind15_package() {
 	short_desc+=" - libunwind"
 	pkg_install() {
 		vmove "usr/lib/libunwind.so.*"
 	}
 }
 
-llvm-libunwind-devel_package() {
+llvm-libunwind15-devel_package() {
 	short_desc+=" - libunwind - development files"
-	depends="llvm-libunwind>=${version}_${revision}"
+	depends="llvm-libunwind15>=${version}_${revision}"
 	conflicts="libunwind-devel>=0"
 	pkg_install() {
 		vmove usr/include/mach-o
@@ -383,16 +383,16 @@ llvm-libunwind-devel_package() {
 	}
 }
 
-libcxxabi_package() {
+libcxxabi15_package() {
 	short_desc+=" - low level support for libc++"
 	pkg_install() {
 		vmove "usr/lib/libc++abi.so.*"
 	}
 }
 
-libcxxabi-devel_package() {
+libcxxabi15-devel_package() {
 	short_desc+=" - low level support for libc++ - development files"
-	depends="libcxxabi>=${version}_${revision}"
+	depends="libcxxabi15>=${version}_${revision}"
 	pkg_install() {
 		vmove "usr/include/*cxxabi*"
 		vmove "usr/lib/libc++abi.so"
@@ -400,16 +400,16 @@ libcxxabi-devel_package() {
 	}
 }
 
-libcxx_package() {
+libcxx15_package() {
 	short_desc+=" - C++ standard library"
 	pkg_install() {
 		vmove "usr/lib/libc++.so.*"
 	}
 }
 
-libcxx-devel_package() {
+libcxx15-devel_package() {
 	short_desc+=" - C++ standard library - development files"
-	depends="libcxx>=${version}_${revision}"
+	depends="libcxx15>=${version}_${revision}"
 	pkg_install() {
 		vmove usr/include/c++
 		vmove "usr/lib/libc++.so"
@@ -419,19 +419,16 @@ libcxx-devel_package() {
 	}
 }
 
-libomp_package() {
+libomp15_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() {
+libomp15-devel_package() {
 	short_desc+=" - Clang OpenMP support library - development files"
-	depends="libomp>=${version}_${revision}"
+	depends="libomp15>=${version}_${revision}"
 	pkg_install() {
 		vmove "usr/include/omp*.h"
 		vmove "usr/lib/clang/${version}/include/omp*.h"
diff --git a/srcpkgs/llvm17/files/llvm-Config-llvm-config.h b/srcpkgs/llvm17/files/llvm-Config-llvm-config.h
new file mode 100644
index 0000000000000..2fa08c9be6962
--- /dev/null
+++ b/srcpkgs/llvm17/files/llvm-Config-llvm-config.h
@@ -0,0 +1,9 @@
+#include <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/llvm17/patches/SmallVector.patch b/srcpkgs/llvm17/patches/SmallVector.patch
new file mode 100644
index 0000000000000..ac10d306c4346
--- /dev/null
+++ b/srcpkgs/llvm17/patches/SmallVector.patch
@@ -0,0 +1,13 @@
+diff --git a/llvm/include/llvm/ADT/SmallVector.h b/llvm/include/llvm/ADT/SmallVector.h
+index 2e6d2dc6ce90..be2cf6cc1fee 100644
+--- a/llvm/include/llvm/ADT/SmallVector.h
++++ b/llvm/include/llvm/ADT/SmallVector.h
+@@ -1163,7 +1163,7 @@ template <typename T> struct CalculateSmallVectorDefaultInlinedElements {
+   // happens on a 32-bit host and then fails due to sizeof(T) *increasing* on a
+   // 64-bit host, is expected to be very rare.
+   static_assert(
+-      sizeof(T) <= 256,
++      sizeof(T) <= 288,
+       "You are trying to use a default number of inlined elements for "
+       "`SmallVector<T>` but `sizeof(T)` is really big! Please use an "
+       "explicit number of inlined elements with `SmallVector<T, N>` to make "
diff --git a/srcpkgs/llvm17/patches/clang-001-fix-unwind-chain-inclusion.patch b/srcpkgs/llvm17/patches/clang-001-fix-unwind-chain-inclusion.patch
new file mode 100644
index 0000000000000..e4eaa7783e7a6
--- /dev/null
+++ b/srcpkgs/llvm17/patches/clang-001-fix-unwind-chain-inclusion.patch
@@ -0,0 +1,44 @@
+From 352974169f0d2b5da3d5321f588f5e3b5941330e Mon Sep 17 00:00:00 2001
+From: Andrea Brancaleoni <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/llvm17/patches/clang-002-add-musl-triples.patch b/srcpkgs/llvm17/patches/clang-002-add-musl-triples.patch
new file mode 100644
index 0000000000000..0ef4c7e75d6b5
--- /dev/null
+++ b/srcpkgs/llvm17/patches/clang-002-add-musl-triples.patch
@@ -0,0 +1,115 @@
+--- a/clang/lib/Driver/ToolChains/Gnu.cpp
++++ b/clang/lib/Driver/ToolChains/Gnu.cpp
+@@ -2086,7 +2086,8 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
+   static const char *const ARMHFTriples[] = {"arm-linux-gnueabihf",
+                                              "armv7hl-redhat-linux-gnueabi",
+                                              "armv6hl-suse-linux-gnueabi",
+-                                             "armv7hl-suse-linux-gnueabi"};
++                                             "armv7hl-suse-linux-gnueabi",
++                                             "armv7l-linux-gnueabihf"};
+   static const char *const ARMebLibDirs[] = {"/lib"};
+   static const char *const ARMebTriples[] = {"armeb-linux-gnueabi",
+                                              "armeb-linux-androideabi"};
+@@ -2153,8 +2154,7 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
+       "powerpc64-suse-linux", "powerpc-montavista-linuxspe"};
+   static const char *const PPCLELibDirs[] = {"/lib32", "/lib"};
+   static const char *const PPCLETriples[] = {"powerpcle-linux-gnu",
+-                                             "powerpcle-unknown-linux-gnu",
+-                                             "powerpcle-linux-musl"};
++                                             "powerpcle-unknown-linux-gnu"};
+ 
+   static const char *const PPC64LibDirs[] = {"/lib64", "/lib"};
+   static const char *const PPC64Triples[] = {
+@@ -2235,6 +2235,92 @@ void Generic_GCC::GCCInstallationDetector::AddDefaultGCCPrefixes(
+     return;
+   }
+ 
++  if (TargetTriple.isMusl()) {
++    static const char *const AArch64MuslTriples[] = {"aarch64-linux-musl"};
++    static const char *const ARMHFMuslTriples[] = {
++        "arm-linux-musleabihf", "armv7l-linux-musleabihf"
++    };
++    static const char *const ARMMuslTriples[] = {"arm-linux-musleabi"};
++    static const char *const X86_64MuslTriples[] = {"x86_64-linux-musl"};
++    static const char *const X86MuslTriples[] = {"i686-linux-musl"};
++    static const char *const MIPSMuslTriples[] = {
++        "mips-linux-musl", "mipsel-linux-musl",
++        "mipsel-linux-muslhf", "mips-linux-muslhf"
++    };
++    static const char *const PPCMuslTriples[] = {"powerpc-linux-musl"};
++    static const char *const PPCLEMuslTriples[] = {"powerpcle-linux-musl"};
++    static const char *const PPC64MuslTriples[] = {"powerpc64-linux-musl"};
++    static const char *const PPC64LEMuslTriples[] = {"powerpc64le-linux-musl"};
++    static const char *const RISCV64MuslTriples[] = {"riscv64-linux-musl"};
++
++    switch (TargetTriple.getArch()) {
++    case llvm::Triple::aarch64:
++      LibDirs.append(begin(AArch64LibDirs), end(AArch64LibDirs));
++      TripleAliases.append(begin(AArch64MuslTriples), end(AArch64MuslTriples));
++      BiarchLibDirs.append(begin(AArch64LibDirs), end(AArch64LibDirs));
++      BiarchTripleAliases.append(begin(AArch64MuslTriples), end(AArch64MuslTriples));
++      break;
++    case llvm::Triple::arm:
++      LibDirs.append(begin(ARMLibDirs), end(ARMLibDirs));
++      if (TargetTriple.getEnvironment() == llvm::Triple::MuslEABIHF) {
++        TripleAliases.append(begin(ARMHFMuslTriples), end(ARMHFMuslTriples));
++      } else {
++        TripleAliases.append(begin(ARMMuslTriples), end(ARMMuslTriples));
++      }
++      break;
++    case llvm::Triple::x86_64:
++      LibDirs.append(begin(X86_64LibDirs), end(X86_64LibDirs));
++      TripleAliases.append(begin(X86_64MuslTriples), end(X86_64MuslTriples));
++      BiarchLibDirs.append(begin(X86LibDirs), end(X86LibDirs));
++      BiarchTripleAliases.append(begin(X86MuslTriples), end(X86MuslTriples));
++      break;
++    case llvm::Triple::x86:
++      LibDirs.append(begin(X86LibDirs), end(X86LibDirs));
++      TripleAliases.append(begin(X86MuslTriples), end(X86MuslTriples));
++      BiarchLibDirs.append(begin(X86_64LibDirs), end(X86_64LibDirs));
++      BiarchTripleAliases.append(begin(X86_64MuslTriples), end(X86_64MuslTriples));
++      break;
++    case llvm::Triple::mips:
++      LibDirs.append(begin(MIPSLibDirs), end(MIPSLibDirs));
++      TripleAliases.append(begin(MIPSMuslTriples), end(MIPSMuslTriples));
++      break;
++    case llvm::Triple::ppc:
++      LibDirs.append(begin(PPCLibDirs), end(PPCLibDirs));
++      TripleAliases.append(begin(PPCMuslTriples), end(PPCMuslTriples));
++      BiarchLibDirs.append(begin(PPC64LibDirs), end(PPC64LibDirs));
++      BiarchTripleAliases.append(begin(PPC64MuslTriples), end(PPC64MuslTriples));
++      break;
++    case llvm::Triple::ppcle:
++      LibDirs.append(begin(PPCLELibDirs), end(PPCLELibDirs));
++      TripleAliases.append(begin(PPCLEMuslTriples), end(PPCLEMuslTriples));
++      BiarchLibDirs.append(begin(PPC64LELibDirs), end(PPC64LELibDirs));
++      BiarchTripleAliases.append(begin(PPC64LEMuslTriples), end(PPC64LEMuslTriples));
++      break;
++    case llvm::Triple::ppc64:
++      LibDirs.append(begin(PPC64LibDirs), end(PPC64LibDirs));
++      TripleAliases.append(begin(PPC64MuslTriples), end(PPC64MuslTriples));
++      BiarchLibDirs.append(begin(PPCLibDirs), end(PPCLibDirs));
++      BiarchTripleAliases.append(begin(PPCMuslTriples), end(PPCMuslTriples));
++      break;
++    case llvm::Triple::ppc64le:
++      LibDirs.append(begin(PPC64LELibDirs), end(PPC64LELibDirs));
++      TripleAliases.append(begin(PPC64LEMuslTriples), end(PPC64LEMuslTriples));
++      BiarchLibDirs.append(begin(PPCLELibDirs), end(PPCLELibDirs));
++      BiarchTripleAliases.append(begin(PPCLEMuslTriples), end(PPCLEMuslTriples));
++      break;
++    case llvm::Triple::riscv64:
++      LibDirs.append(begin(RISCV64LibDirs), end(RISCV64LibDirs));
++      TripleAliases.append(begin(RISCV64MuslTriples), end(RISCV64MuslTriples));
++      break;
++    default:
++      break;
++    }
++    TripleAliases.push_back(TargetTriple.str());
++    if (TargetTriple.str() != BiarchTriple.str())
++      BiarchTripleAliases.push_back(BiarchTriple.str());
++    return;
++  }
++
+   // Android targets should not use GNU/Linux tools or libraries.
+   if (TargetTriple.isAndroid()) {
+     static const char *const AArch64AndroidTriples[] = {
diff --git a/srcpkgs/llvm17/patches/clang-003-ppc64-dynamic-linker-path.patch b/srcpkgs/llvm17/patches/clang-003-ppc64-dynamic-linker-path.patch
new file mode 100644
index 0000000000000..4ad6412d1e6c6
--- /dev/null
+++ b/srcpkgs/llvm17/patches/clang-003-ppc64-dynamic-linker-path.patch
@@ -0,0 +1,13 @@
+--- a/clang/lib/Driver/ToolChains/Linux.cpp
++++ b/clang/lib/Driver/ToolChains/Linux.cpp
+@@ -504,10 +504,6 @@ std::string Linux::getDynamicLinker(const ArgList &Args) const {
+     Loader = "ld.so.1";
+     break;
+   case llvm::Triple::ppc64:
+-    LibDir = "lib64";
+-    Loader =
+-        (tools::ppc::hasPPCAbiArg(Args, "elfv2")) ? "ld64.so.2" : "ld64.so.1";
+-    break;
+   case llvm::Triple::ppc64le:
+     LibDir = "lib64";
+     Loader =
diff --git a/srcpkgs/llvm17/patches/compiler-rt-sanitizer-ppc64-musl.patch b/srcpkgs/llvm17/patches/compiler-rt-sanitizer-ppc64-musl.patch
new file mode 100644
index 0000000000000..b6d385c1d1814
--- /dev/null
+++ b/srcpkgs/llvm17/patches/compiler-rt-sanitizer-ppc64-musl.patch
@@ -0,0 +1,37 @@
+--- a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp
++++ b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp
+@@ -74,6 +74,10 @@
+ #include <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__) || defined(__loongarch__) ||SANITIZER_RISCV64
++        defined(__hexagon__) || defined(__powerpc__) || defined(__loongarch__) ||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_LOONGARCH64) && \
+-     !SANITIZER_ANDROID
++#if (defined(__aarch64__) || defined(__powerpc__) ||SANITIZER_RISCV64 || SANITIZER_LOONGARCH64) && \
++     !SANITIZER_ANDROID
+ // GLIBC 2.20+ sys/user does not include asm/ptrace.h
+ # include <asm/ptrace.h>
+ #endif
diff --git a/srcpkgs/llvm17/patches/compiler-rt-sanitizer-supported-arch.patch b/srcpkgs/llvm17/patches/compiler-rt-sanitizer-supported-arch.patch
new file mode 100644
index 0000000000000..c9b9286ac37b3
--- /dev/null
+++ b/srcpkgs/llvm17/patches/compiler-rt-sanitizer-supported-arch.patch
@@ -0,0 +1,22 @@
+Based on patch from Alpine:
+https://gitlab.alpinelinux.org/alpine/aports/-/blob/693203c42aa1cde88cb547173ef67a98824973fd/main/llvm-runtimes/compiler-rt-sanitizer-supported-arch.patch
+
+Sanitizer code is broken on armhf, armv7, s390x, x86, and probably riscv64 on musl,
+i.e. enable it only on x86_64, aarch64, and ppc64le.
+
+--- a/compiler-rt/cmake/Modules/AllSupportedArchDefs.cmake
++++ b/compiler-rt/cmake/Modules/AllSupportedArchDefs.cmake
+@@ -23,9 +23,13 @@ if(APPLE)
+   set(X86_64 x86_64 x86_64h)
+ endif()
+ 
++if (LIBCXX_HAS_MUSL_LIBC)
++set(ALL_SANITIZER_COMMON_SUPPORTED_ARCH ${X86_64} ${ARM64} ${PPC64})
++else()
+ set(ALL_SANITIZER_COMMON_SUPPORTED_ARCH ${X86} ${X86_64} ${PPC64} ${RISCV64}
+     ${ARM32} ${ARM64} ${MIPS32} ${MIPS64} ${S390X} ${SPARC} ${SPARCV9}
+     ${HEXAGON} ${LOONGARCH64})
++endif()
+ set(ALL_ASAN_SUPPORTED_ARCH ${X86} ${X86_64} ${ARM32} ${ARM64} ${RISCV64}
+     ${MIPS32} ${MIPS64} ${PPC64} ${S390X} ${SPARC} ${SPARCV9} ${HEXAGON}
+     ${LOONGARCH64})
diff --git a/srcpkgs/llvm17/patches/libcxx-armv67.patch b/srcpkgs/llvm17/patches/libcxx-armv67.patch
new file mode 100644
index 0000000000000..700ab13479045
--- /dev/null
+++ b/srcpkgs/llvm17/patches/libcxx-armv67.patch
@@ -0,0 +1,35 @@
+See: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=109180
+Avoid the following undefined reference:
+
+/usr/lib/gcc/armv7l-linux-gnueabihf/12.2.0/../../../../armv7l-linux-gnueabihf/bin/ld: projects/libcxx/src/CMakeFiles/cxx_shared.dir/locale.cpp.o: in function `std::__1::__time_get_c_storage<char>::__x() const [clone .localalias]':
+locale.cpp:(.text._ZNKSt3__120__time_get_c_storageIcE3__xEv+0xb4): undefined reference to `std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >::~basic_string()'
+/usr/lib/gcc/armv7l-linux-gnueabihf/12.2.0/../../../../armv7l-linux-gnueabihf/bin/ld: projects/libcxx/src/CMakeFiles/cxx_shared.dir/locale.cpp.o: in function `std::__1::__time_get_c_storage<char>::__X() const [clone .localalias]':
+
+diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt
+index b8ac536588d3..65e5a1365634 100644
+--- a/libcxx/CMakeLists.txt
++++ b/libcxx/CMakeLists.txt
+@@ -308,6 +308,8 @@ endif()
+ option(LIBCXX_HERMETIC_STATIC_LIBRARY
+   "Do not export any symbols from the static library." ${LIBCXX_HERMETIC_STATIC_LIBRARY_DEFAULT})
+ 
++option(LIBCXX_VOID_GCC_BUG_109180_WORKAROUND OFF)
++
+ #===============================================================================
+ # Check option configurations
+ #===============================================================================
+diff --git a/libcxx/src/CMakeLists.txt b/libcxx/src/CMakeLists.txt
+index 35b466527096..5b0efa171616 100644
+--- a/libcxx/src/CMakeLists.txt
++++ b/libcxx/src/CMakeLists.txt
+@@ -155,6 +155,10 @@ if (LIBCXX_GENERATE_COVERAGE AND NOT LIBCXX_COVERAGE_LIBRARY)
+ endif()
+ add_library_flags_if(LIBCXX_COVERAGE_LIBRARY "${LIBCXX_COVERAGE_LIBRARY}")
+ 
++if (LIBCXX_VOID_GCC_BUG_109180_WORKAROUND)
++  set_source_files_properties(string.cpp PROPERTIES COMPILE_FLAGS -fno-inline)
++endif()
++
+ if (APPLE AND LLVM_USE_SANITIZER)
+   if (("${LLVM_USE_SANITIZER}" STREQUAL "Address") OR
+       ("${LLVM_USE_SANITIZER}" STREQUAL "Address;Undefined") OR
diff --git a/srcpkgs/llvm17/patches/libcxx-musl.patch b/srcpkgs/llvm17/patches/libcxx-musl.patch
new file mode 100644
index 0000000000000..fb0ea3da4d057
--- /dev/null
+++ b/srcpkgs/llvm17/patches/libcxx-musl.patch
@@ -0,0 +1,27 @@
+--- a/libcxx/include/locale
++++ b/libcxx/include/locale
+@@ -742,7 +742,11 @@ __num_get_signed_integral(const char* __a, const char* __a_end,
+         typename remove_reference<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
+         __libcpp_remove_reference_t<decltype(errno)> __current_errno = errno;
+         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
+         __libcpp_remove_reference_t<decltype(errno)> __current_errno = errno;
+         if (__current_errno == 0)
+             errno = __save_errno;
diff --git a/srcpkgs/llvm17/patches/libcxx-ssp-nonshared.patch b/srcpkgs/llvm17/patches/libcxx-ssp-nonshared.patch
new file mode 100644
index 0000000000000..70292beb2fcdb
--- /dev/null
+++ b/srcpkgs/llvm17/patches/libcxx-ssp-nonshared.patch
@@ -0,0 +1,11 @@
+--- a/libcxx/CMakeLists.txt
++++ b/libcxx/CMakeLists.txt
+@@ -769,6 +769,8 @@ function(cxx_link_system_libraries target)
+     target_link_libraries(${target} PRIVATE atomic)
+   endif()
+ 
++#ssp  target_link_libraries(${target} PRIVATE ssp_nonshared)
++
+   if (MINGW)
+     target_link_libraries(${target} PRIVATE "${MINGW_LIBRARIES}")
+   endif()
diff --git a/srcpkgs/llvm17/patches/libcxxabi-dl.patch b/srcpkgs/llvm17/patches/libcxxabi-dl.patch
new file mode 100644
index 0000000000000..3a15f9db8c981
--- /dev/null
+++ b/srcpkgs/llvm17/patches/libcxxabi-dl.patch
@@ -0,0 +1,25 @@
+Also link to -ldl to prevent undefined references.
+
+--- a/libcxxabi/src/CMakeLists.txt
++++ b/libcxxabi/src/CMakeLists.txt
+@@ -73,6 +73,7 @@
+   endif()
+ 
+   add_library_flags_if(LIBCXXABI_HAS_C_LIB c)
++  add_library_flags_if(LIBCXXABI_HAS_C_LIB dl)
+ endif()
+ 
+ if (LIBCXXABI_USE_LLVM_UNWINDER)
+--- a/libcxx/CMakeLists.txt
++++ b/libcxx/CMakeLists.txt
+@@ -745,6 +745,10 @@
+     target_link_libraries(${target} PRIVATE m)
+   endif()
+ 
++  if (LIBCXX_HAS_C_LIB)
++    target_link_libraries(${target} PRIVATE dl)
++  endif()
++
+   if (LIBCXX_HAS_RT_LIB)
+     target_link_libraries(${target} PRIVATE rt)
+   endif()
diff --git a/srcpkgs/llvm17/patches/libomp-soname.patch b/srcpkgs/llvm17/patches/libomp-soname.patch
new file mode 100644
index 0000000000000..9a622cd9254c2
--- /dev/null
+++ b/srcpkgs/llvm17/patches/libomp-soname.patch
@@ -0,0 +1,12 @@
+diff --git a/openmp/runtime/src/CMakeLists.txt b/openmp/runtime/src/CMakeLists.txt
+index df1ca9d90..9d2c3b7b9 100644
+--- a/openmp/runtime/src/CMakeLists.txt
++++ b/openmp/runtime/src/CMakeLists.txt
+@@ -150,6 +150,7 @@ libomp_get_libflags(LIBOMP_CONFIGURED_LIBFLAGS)
+ # Build libomp library. Add LLVMSupport dependency if building in-tree with libomptarget profiling enabled.
+ if(OPENMP_STANDALONE_BUILD OR (NOT OPENMP_ENABLE_LIBOMP_PROFILING))
+   add_library(omp ${LIBOMP_LIBRARY_KIND} ${LIBOMP_SOURCE_FILES})
++  set_target_properties(omp PROPERTIES VERSION ${LIBOMP_VERSION_MAJOR} SOVERSION ${LIBOMP_VERSION_MAJOR})
+   # Linking command will include libraries in LIBOMP_CONFIGURED_LIBFLAGS
+   target_link_libraries(omp ${LIBOMP_CONFIGURED_LIBFLAGS} ${LIBOMP_DL_LIBS})
+ else()
diff --git a/srcpkgs/llvm17/patches/llvm-001-musl.patch b/srcpkgs/llvm17/patches/llvm-001-musl.patch
new file mode 100644
index 0000000000000..b6efd02a5698f
--- /dev/null
+++ b/srcpkgs/llvm17/patches/llvm-001-musl.patch
@@ -0,0 +1,44 @@
+From faca3fbd15d0c3108493c3c54cd93138e049ac43 Mon Sep 17 00:00:00 2001
+From: Andrea Brancaleoni <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/utils/unittest/googletest/src/gtest.cc b/utils/unittest/googletest/src/gtest.cc
+index d882ab2e..f1fb12d0 100644
+--- a/third-party/unittest/googletest/src/gtest.cc
++++ b/third-party/unittest/googletest/src/gtest.cc
+@@ -128,6 +128,7 @@
+ 
+ #if GTEST_CAN_STREAM_RESULTS_
+ # include <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/llvm17/patches/llvm-004-override-opt.patch b/srcpkgs/llvm17/patches/llvm-004-override-opt.patch
new file mode 100644
index 0000000000000..51d0e4b31b32c
--- /dev/null
+++ b/srcpkgs/llvm17/patches/llvm-004-override-opt.patch
@@ -0,0 +1,18 @@
+This allows us to override the optimization level as not all platforms can
+deal with -O3.
+
+--- a/llvm/CMakeLists.txt
++++ b/llvm/CMakeLists.txt
+@@ -918,6 +918,12 @@ if( MINGW AND NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" )
+   llvm_replace_compiler_option(CMAKE_CXX_FLAGS_RELEASE "-O3" "-O2")
+ endif()
+ 
++set(VOID_CXX_OPT_FLAGS "" CACHE STRING "Optimization level to use")
++
++if (NOT VOID_CXX_OPT_FLAGS STREQUAL "")
++    llvm_replace_compiler_option(CMAKE_CXX_FLAGS_RELEASE "-O3" "${VOID_CXX_OPT_FLAGS}")
++endif()
++
+ # Put this before tblgen. Else we have a circular dependence.
+ add_subdirectory(lib/Demangle)
+ add_subdirectory(lib/Support)
diff --git a/srcpkgs/llvm17/patches/llvm-005-ppc-bigpic.patch b/srcpkgs/llvm17/patches/llvm-005-ppc-bigpic.patch
new file mode 100644
index 0000000000000..d332687b9d929
--- /dev/null
+++ b/srcpkgs/llvm17/patches/llvm-005-ppc-bigpic.patch
@@ -0,0 +1,36 @@
+From f3dbdd49c06bfafc1d6138094cf42889c14d38b6 Mon Sep 17 00:00:00 2001
+From: Samuel Holland <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/llvm17/patches/llvm-006-aarch64-mf_exec.patch b/srcpkgs/llvm17/patches/llvm-006-aarch64-mf_exec.patch
new file mode 100644
index 0000000000000..192b4824b8695
--- /dev/null
+++ b/srcpkgs/llvm17/patches/llvm-006-aarch64-mf_exec.patch
@@ -0,0 +1,24 @@
+Fix failures in AllocationTests/MappedMemoryTest.* on aarch64:
+
+    Failing Tests (8):
+        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.AllocAndRelease/3
+        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.DuplicateNear/3
+        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.EnabledWrite/3
+        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.MultipleAllocAndRelease/3
+        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.SuccessiveNear/3
+        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.UnalignedNear/3
+        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.ZeroNear/3
+        LLVM-Unit :: Support/./SupportTests/AllocationTests/MappedMemoryTest.ZeroSizeNear/3
+
+Upstream-Issue: https://bugs.llvm.org/show_bug.cgi?id=14278#c10
+
+--- a/llvm/lib/Support/Unix/Memory.inc
++++ b/llvm/lib/Support/Unix/Memory.inc
+@@ -58,7 +58,7 @@ static int getPosixProtectionFlags(unsigned Flags) {
+     return PROT_READ | PROT_WRITE | PROT_EXEC;
+   case llvm::sys::Memory::MF_EXEC:
+-#if defined(__FreeBSD__) || defined(__powerpc__)
++#if defined(__FreeBSD__) || defined(__powerpc__) || (defined(__linux__) && defined(__aarch64__))
+     // On PowerPC, having an executable page that has no read permission
+     // can have unintended consequences.  The function InvalidateInstruction-
+     // Cache uses instructions dcbf and icbi, both of which are treated by
diff --git a/srcpkgs/llvm17/template b/srcpkgs/llvm17/template
new file mode 100644
index 0000000000000..528a9cee37996
--- /dev/null
+++ b/srcpkgs/llvm17/template
@@ -0,0 +1,817 @@
+# Template file for 'llvm17'
+pkgname=llvm17
+version=17.0.6
+revision=1
+build_wrksrc=llvm
+build_style=cmake
+_ext_suffix=".cpython-${py3_ver/./}-linux-${XBPS_TARGET_LIBC/glibc/gnu}.so"
+configure_args="
+ -DCMAKE_BUILD_TYPE=Release -Wno-dev
+ -DENABLE_LINKER_BUILD_ID=YES
+ -DLLDB_USE_SYSTEM_SIX=YES
+ -DLIBCXX_CXX_ABI=libcxxabi
+ -DLIBCXX_ENABLE_STATIC_ABI_LIBRARY=YES
+ -DLIBCXXABI_USE_LLVM_UNWINDER=YES
+ -DLIBCXXABI_ENABLE_STATIC_UNWINDER=YES
+ -DLIBOMP_ENABLE_SHARED=YES
+ -DLIBOMP_INSTALL_ALIASES=NO
+ -DLLVM_INCLUDE_DOCS=YES
+ -DLLVM_BUILD_DOCS=YES
+ -DLLVM_ENABLE_SPHINX=YES
+ -DSPHINX_WARNINGS_AS_ERRORS=NO
+ -DLLVM_INSTALL_UTILS=YES
+ -DLLVM_BUILD_LLVM_DYLIB=YES
+ -DLLVM_LINK_LLVM_DYLIB=YES
+ -DCLANG_LINK_CLANG_DYLIB=YES
+ -DLLVM_ENABLE_RTTI=YES
+ -DLLVM_ENABLE_FFI=YES
+ -DLLVM_ENABLE_RUNTIMES=all
+ -DLLVM_BINUTILS_INCDIR=/usr/include
+ -DLLVM_ENABLE_PER_TARGET_RUNTIME_DIR=NO
+ -DLLDB_PYTHON_RELATIVE_PATH=lib/python${py3_ver}/site-packages
+ -DLLDB_PYTHON_EXE_RELATIVE_PATH=bin/python${py3_ver}
+ -DLLDB_PYTHON_EXT_SUFFIX=$_ext_suffix "
+hostmakedepends="perl python3 zlib-devel libffi-devel swig python3-Sphinx
+ python3-recommonmark python3-sphinx-automodapi git python3-sphinx-markdown-tables python3-yaml pkg-config "
+makedepends="python3-devel zlib-devel elfutils-devel libffi-devel libedit-devel
+ libxml2-devel binutils-devel "
+depends="libllvm>=${version}_${revision}"
+short_desc="LLVM Compiler Infrastructure Project - Version 17"
+maintainer="Daniel Martinez <danielmartinez@cock.li>"
+license="Apache-2.0"
+homepage="https://www.llvm.org"
+distfiles="https://github.com/llvm/llvm-project/releases/download/llvmorg-${version}/llvm-project-${version}.src.tar.xz"
+checksum=58a8818c60e6627064f312dbf46c02d9949956558340938b71cf731ad8bc0813
+lib32disabled=yes
+python_version=3
+
+build_options="clang clang_tools_extra lld mlir libclc polly lldb flang bolt openmp"
+build_options_default="clang clang_tools_extra lld mlir libclc polly lldb"
+
+case "$XBPS_TARGET_MACHINE" in
+	x86_64*|aarch64*) build_options_default+=" flang bolt openmp ";;
+esac
+
+if [ "$XBPS_CCACHE" ]; then
+	configure_args+=" -DLLVM_CCACHE_BUILD=YES "
+fi
+
+if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+	configure_args+=" -DLIBCXX_HAS_MUSL_LIBC=YES
+	 -DCOMPILER_RT_BUILD_GWP_ASAN=OFF"
+fi
+
+if [ "$build_option_clang" ]; then
+	_enabled_projects+="clang;"
+	subpackages+=" clang clang-devel libclang libclang-cpp clang-analyzer "
+fi
+if [ "$build_option_clang_tools_extra" ]; then
+	_enabled_projects+="clang-tools-extra;"
+	subpackages+=" clang-tools-extra "
+fi
+if [ "$build_option_bolt" ]; then
+	_enabled_projects+="bolt;"
+	subpackages+=" llvm-bolt "
+fi
+if [ "$build_option_polly" ]; then
+	_enabled_projects+="polly;"
+fi
+if [ "$build_option_lldb" ]; then
+	_enabled_projects+="lldb;"
+	subpackages+=" lldb lldb-devel "
+fi
+if [ "$build_option_lld" ]; then
+	_enabled_projects+="lld;"
+	subpackages+=" lld lld-devel "
+fi
+if [ "$build_option_libclc" ]; then
+	_enabled_projects+="libclc;"
+fi
+if [ "$build_option_mlir" ]; then
+	_enabled_projects+="mlir;"
+	subpackages+=" mlir mlir-devel "
+fi
+if [ "$build_option_flang" ]; then
+	_enabled_projects+="flang;"
+	subpackages+=" flang flang-devel "
+fi
+if [ "$build_option_openmp" ]; then
+	_enabled_projects+="openmp;"
+	subpackages+=" libomp libomp-devel "
+fi
+subpackages+=" llvm-libunwind llvm-libunwind-devel libcxx libcxx-devel libcxxabi libcxxabi-devel libllvm llvm-devel "
+
+configure_args+=" -DLLVM_ENABLE_PROJECTS=${_enabled_projects}"
+
+if [ "$CROSS_BUILD" ]; then
+	# Seems to require a full host llvm/clang build
+	configure_args+=" -DLIBOMPTARGET_BUILD_CUDA_PLUGIN=OFF"
+	configure_args+=" -DLIBOMPTARGET_BUILD_AMDGPU_PLUGIN=OFF"
+fi
+
+
+# For OCaml bindings and lldb lua scripting
+if [ -z "$CROSS_BUILD" ]; then
+	# OCaml cross build is broken
+	hostmakedepends+=" ocaml ocaml-findlib "
+	# lldb cross build fails with lua
+	makedepends+=" lua53-devel "
+fi
+
+post_patch() {
+	if [ "$build_option_lldb" ]; then
+		if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
+			vsed -i 's|__ptrace_request|int|g' \
+				${wrksrc}/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp
+		fi
+		# disable docs for lldb as they fail to generate
+		vsed -i '/add_subdirectory(docs)/d' \
+			${wrksrc}/lldb/CMakeLists.txt
+	fi
+
+	# update config.guess for better platform detection
+	cp $XBPS_COMMONDIR/environment/configure/automake/config.guess \
+		${wrksrc}/llvm/cmake
+
+	# fix linker failures on some archs
+	vsed -i 's,check_library_exists(gcc_s .*,set(LIBCXXABI_HAS_GCC_S_LIB ON),' \
+		${wrksrc}/libcxxabi/cmake/config-ix.cmake
+	vsed -i 's,check_library_exists(gcc .*,set(LIBCXXABI_HAS_GCC_LIB ON),' \
+		${wrksrc}/libcxxabi/cmake/config-ix.cmake
+
+	# need libssp_nonshared on some musl platforms (because of nodefaultlibs)
+	case "$XBPS_TARGET_MACHINE" in
+		ppc64*) ;;
+		ppc*-musl|i686-musl|mips*-musl)
+			vsed -i 's,^# Setup flags.$,add_library_flags(ssp_nonshared),' \
+				${wrksrc}/libunwind/src/CMakeLists.txt
+			vsed -i 's,^# Setup flags.$,add_library_flags(ssp_nonshared),' \
+				${wrksrc}/libcxxabi/src/CMakeLists.txt
+			vsed -i 's,#ssp,,' ${wrksrc}/libcxx/CMakeLists.txt
+			;;
+	esac
+}
+
+pre_configure() {
+	local triplet
+
+	# Vastly reduce size of debugging symbols:
+	CFLAGS=${CFLAGS/ -g/ -g1}
+	CXXFLAGS=${CXXFLAGS/ -g/ -g1}
+
+	# since gcc9, the build likes to blow up for ppc32 apparently because
+	# of clang being too large for a 24-bit relative call to the PLT, so
+	# optimize for size instead
+	case "$XBPS_TARGET_MACHINE" in
+		ppc64*) ;;
+		mips*-musl|ppc*) configure_args+=" -DVOID_CXX_OPT_FLAGS=-Os" ;;
+		armv*) configure_args+=" -DLIBCXX_VOID_GCC_BUG_109180_WORKAROUND=ON ";;
+	esac
+
+	if [ "$CROSS_BUILD" ]; then
+		msg_normal "Building host tblgen\n"
+		mkdir -p build/HOST
+		cd build/HOST
+		CC="$BUILD_CC" CXX="$BUILD_CXX" CFLAGS="$BUILD_CFLAGS" \
+			CXXFLAGS="$BUILD_CXXFLAGS" LDFLAGS="$BUILD_LDFLAGS" \
+			cmake ../.. -DCMAKE_BUILD_TYPE=Release \
+			-DLLVM_ENABLE_PROJECTS=${_enabled_projects}
+
+		make ${makejobs} -C utils/TableGen
+		configure_args+=" -DLLVM_TABLEGEN=${wrksrc}/llvm/build/HOST/bin/llvm-tblgen"
+
+		make ${makejobs} -C tools/clang/utils/TableGen
+		configure_args+=" -DCLANG_TABLEGEN=${wrksrc}/llvm/build/HOST/bin/clang-tblgen"
+
+		make ${makejobs} -C tools/mlir/tools/mlir-pdll
+		configure_args+=" -DMLIR_TABLEGEN=${wrksrc}/llvm/build/HOST/bin/mlir-tblgen"
+		configure_args+=" -DMLIR_PDLL_TABLEGEN=${wrksrc}/llvm/build/HOST/bin/mlir-pdll"
+		configure_args+=" -DMLIR_LINALG_ODS_YAML_GEN=${wrksrc}/llvm/build/HOST/bin/mlir-linalg-ods-yaml-gen"
+
+		make ${makejobs} -C tools/clang/tools/extra/clang-tidy/misc/ConfusableTable
+		configure_args+=" -DCLANG_TIDY_CONFUSABLE_CHARS_GEN=${wrksrc}/llvm/build/HOST/bin/clang-tidy-confusable-chars-gen"
+		make ${makejobs} -C tools/clang/tools/extra/pseudo/gen
+		configure_args+=" -DCLANG_PSEUDO_GEN=${wrksrc}/llvm/build/HOST/bin/clang-pseudo-gen"
+
+		make ${makejobs} -C tools/llvm-config
+		configure_args+=" -DLLVM_CONFIG_PATH=${wrksrc}/llvm/build/HOST/bin/llvm-config"
+
+		make ${makejobs} -C tools/lldb/utils/TableGen lldb-tblgen
+		configure_args+=" -DLLDB_TABLEGEN_EXE=${wrksrc}/llvm/build/HOST/bin/lldb-tblgen"
+
+		cd ../..
+	fi
+
+	case "$XBPS_TARGET_MACHINE" in
+	arm*-musl|i686-musl)
+		# sanitizer code is broken since it duplicates some libc bits
+		configure_args+=" -DCOMPILER_RT_BUILD_SANITIZERS=OFF"
+		;;
+	esac
+
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) _arch="X86";;
+		x86_64*) _arch="X86";;
+		armv5*) _arch="Armv5te";;
+		armv6*) _arch="Armv6";;
+		armv7*) _arch="Armv7";;
+		aarch64*) _arch="AArch64";;
+		mips*) _arch="Mips";;
+		ppc*) _arch="PowerPC";;
+		riscv64*) _arch="RISCV64";;
+	esac
+
+	triplet=${XBPS_CROSS_TRIPLET:-$XBPS_TRIPLET}
+
+	configure_args+=" -DLLVM_TARGET_ARCH=${_arch}"
+	configure_args+=" -DLLVM_HOST_TRIPLE=${triplet}"
+	configure_args+=" -DLLVM_DEFAULT_TARGET_TRIPLE=${triplet}"
+}
+
+post_build() {
+
+	mkdir -p ${wrksrc}/${build_wrksrc}/runtimes-doc
+	cmake -G Ninja ${wrksrc}/runtimes -B ${wrksrc}/${build_wrksrc}/runtimes-doc \
+		-DLLVM_ENABLE_RUNTIMES="libcxx;libcxxabi;libunwind" \
+		-DLLVM_ENABLE_SPHINX=ON \
+		-DSPHINX_WARNINGS_AS_ERRORS=OFF
+
+	ninja ${makejobs} -C ${wrksrc}/${build_wrksrc}/runtimes-doc docs-libcxx-html docs-libunwind-html
+}
+
+post_install() {
+
+	# Required for multilib.
+	if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
+		for _header in llvm-config; do
+			mv ${DESTDIR}/usr/include/llvm/Config/${_header}{,-64}.h
+			vinstall ${FILESDIR}/llvm-Config-${_header}.h 644 \
+				usr/include/llvm/Config ${_header}.h
+		done
+	fi
+
+	# Remove llvm-config-host in cross builds.
+	if [ "$CROSS_BUILD" ]; then
+		rm -f ${DESTDIR}/usr/bin/llvm-config-host
+	fi
+
+	rm -rf ${DESTDIR}/usr/share/gdb
+
+	# Install libcxxabi headers
+	vinstall ${wrksrc}/libcxxabi/include/__cxxabi_config.h 644 usr/include
+	vinstall ${wrksrc}/libcxxabi/include/cxxabi.h 644 usr/include
+
+	# Install libunwind headers
+	vinstall ${wrksrc}/libunwind/include/__libunwind_config.h 644 usr/include
+	vinstall ${wrksrc}/libunwind/include/libunwind.h 644 usr/include
+	vinstall ${wrksrc}/libunwind/include/unwind.h 644 usr/include
+	vinstall ${wrksrc}/libunwind/include/mach-o/compact_unwind_encoding.h \
+		644 usr/include/mach-o
+
+	# Install libcxx and libunwind docs
+	cmake -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr -P ${wrksrc}/${build_wrksrc}/runtimes-doc/libcxx/docs/cmake_install.cmake
+	cmake -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr -P ${wrksrc}/${build_wrksrc}/runtimes-doc/libunwind/docs/cmake_install.cmake
+
+	# Can this be disabled some other way?
+	rm -rf ${DESTDIR}/usr/lib64
+}
+
+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-17
+		vmove usr/bin/clang
+		vmove usr/bin/clang++
+		vmove usr/bin/clang-cl
+		vmove usr/bin/clang-cpp
+		vmove usr/bin/clang-check
+		vmove usr/bin/clang-extdef-mapping
+		vmove usr/bin/clang-format
+		vmove usr/bin/clang-linker-wrapper
+		vmove usr/bin/clang-offload-bundler
+		vmove usr/bin/clang-offload-packager
+		vmove usr/bin/clang-refactor
+		vmove usr/bin/clang-rename
+		vmove usr/bin/clang-repl
+		vmove usr/bin/clang-scan-deps
+		vmove usr/bin/clang-tblgen
+		vmove usr/bin/c-index-test
+		vmove usr/bin/diagtool
+		vmove usr/bin/amdgpu-arch
+		vmove usr/bin/nvptx-arch
+		vmove usr/share/man/man1/clang.1
+		vmove usr/share/man/man1/diagtool.1
+		if [ "$build_option_polly" ]; then
+			vmove usr/lib/LLVMPolly.so
+			vmove usr/share/man/man1/polly.1
+		fi
+	}
+}
+
+clang-devel_package() {
+	lib32disabled=yes
+	depends="libstdc++-devel libgcc-devel  binutils ${XBPS_TARGET_LIBC}-devel
+	 libclang-${version}_${revision}"
+	short_desc+=" - C language family frontend - development Files"
+	homepage="https://clang.llvm.org/"
+	pkg_install() {
+		vmove usr/include/clang
+		vmove usr/include/clang-c
+		vmove usr/lib/clang
+		vmove usr/lib/libear
+		vmove usr/lib/cmake/clang
+		vmove "usr/lib/libclang*.a"
+		vmove "usr/lib/libclang*.so"
+		vmove usr/share/clang
+		vmove usr/share/doc/LLVM/clang
+		vmove usr/bin/hmaptool
+		vmove usr/bin/git-clang-format
+		if [ "$build_option_clang_tools_extra" ]; then
+			vmove usr/include/clang-tidy
+			vmove usr/lib/libfindAllSymbols.a
+		fi
+		if [ "$build_option_polly" ]; then
+			vmove usr/share/doc/LLVM/polly
+			vmove usr/include/polly
+			vmove usr/lib/cmake/polly
+			vmove "usr/lib/libPolly*.a"
+		fi
+	}
+}
+
+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.*"
+	}
+}
+
+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/scan-view
+		vmove usr/share/scan-build
+		vmove usr/lib/libscanbuild
+		vmove usr/libexec/analyze-c++
+		vmove usr/libexec/analyze-cc
+		vmove usr/libexec/intercept-c++
+		vmove usr/libexec/intercept-cc
+		vmove usr/libexec/c++-analyzer
+		vmove usr/libexec/ccc-analyzer
+		vmove usr/share/man/man1/scan-build.1
+		vmove usr/bin/analyze-build
+		vmove usr/bin/scan-build
+		vmove usr/bin/scan-build-py
+		vmove usr/bin/scan-view
+	}
+}
+
+clang-tools-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-cleaner
+		vmove usr/bin/clang-include-fixer
+		vmove usr/bin/clang-move
+		vmove usr/bin/clang-pseudo
+		vmove usr/bin/clang-query
+		vmove usr/bin/clang-reorder-fields
+		vmove usr/bin/clang-tidy
+		vmove usr/bin/clangd
+		vmove usr/bin/find-all-symbols
+		vmove usr/bin/modularize
+		vmove usr/bin/pp-trace
+		vmove usr/bin/run-clang-tidy
+		vmove usr/share/doc/LLVM/clang-tools
+		vmove usr/share/man/man1/extraclangtools.1
+	}
+}
+
+# "bolt" package name is already used
+llvm-bolt_package() {
+	lib32disabled=yes
+	short_desc+=" - post-link optimizer"
+	homepage="https://github.com/llvm/llvm-project/tree/main/bolt"
+	depends="clang>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin/llvm-bolt
+		vmove usr/bin/perf2bolt
+		vmove usr/bin/llvm-boltdiff
+		vmove usr/bin/merge-fdata
+		vmove usr/bin/llvm-bolt-heatmap
+		vmove usr/share/doc/LLVM/bolt
+		case "$XBPS_TARGET_MACHINE" in
+			x86_64*) vmove usr/lib/libbolt_rt_instr.a
+				 vmove usr/lib/libbolt_rt_hugify.a
+				;;
+		esac
+	}
+}
+
+lldb_package() {
+	lib32disabled=yes
+	depends+=" python3-six"
+	short_desc+=" - LLDB debugger"
+	homepage="https://lldb.llvm.org/"
+	pkg_install() {
+		vmove usr/bin/lldb
+		vmove usr/bin/lldb-argdumper
+		vmove usr/bin/lldb-instr
+		vmove usr/bin/lldb-server
+		vmove usr/bin/lldb-vscode
+		vmove "usr/lib/liblldb*.so.*"
+		vmove "usr/lib/python${py3_ver}/site-packages/lldb"
+		if [ -z "$CROSS_BUILD" ]; then
+			vmove /usr/lib/lua/5.3/lldb.so
+		fi
+	}
+}
+
+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"
+	}
+}
+
+lld_package() {
+	lib32disabled=yes
+	short_desc+=" - linker"
+	homepage="https://lld.llvm.org"
+	pkg_install() {
+		vmove usr/bin/lld
+		vmove usr/bin/lld-link
+		vmove usr/bin/ld.lld
+		vmove usr/bin/ld64.lld
+		vmove usr/bin/wasm-ld
+	}
+}
+
+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"
+		vmove usr/share/doc/LLVM/lld
+	}
+}
+
+mlir_package() {
+	lib32disabled=yes
+	short_desc+=" - multi-level IR compiler framework"
+	homepage="https://mlir.llvm.org/"
+	pkg_install() {
+		vmove "usr/lib/libMLIR*.so.*"
+		vmove "usr/lib/libmlir*.so.*"
+	}
+}
+
+mlir-devel_package() {
+	lib32disabled=yes
+	short_desc+=" - multi-level IR compiler framework - development files"
+	homepage="https://mlir.llvm.org/"
+	pkg_install() {
+		vmove usr/bin/mlir-cpu-runner
+		vmove usr/bin/mlir-linalg-ods-yaml-gen
+		vmove usr/bin/mlir-lsp-server
+		vmove usr/bin/mlir-opt
+		vmove usr/bin/mlir-pdll
+		vmove usr/bin/mlir-pdll-lsp-server
+		vmove usr/bin/mlir-reduce
+		vmove usr/bin/mlir-tblgen
+		vmove usr/bin/mlir-translate
+		vmove usr/bin/tblgen-lsp-server
+		vmove usr/include/mlir
+		vmove usr/include/mlir-c
+		vmove usr/lib/cmake/mlir
+		vmove "usr/lib/libMLIR*"
+		vmove "usr/lib/objects-Release/obj.MLIR*"
+		vmove "usr/lib/libmlir*"
+		vmove usr/share/man/man1/mlir-tblgen.1
+	}
+}
+
+flang_package() {
+	lib32disabled=yes
+	short_desc+=" - Fortran language frontend"
+	homepage="https://flang.llvm.org/"
+	depends="mlir>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin/flang-new
+		vmove usr/bin/flang-to-external-fc
+	}
+}
+
+flang-devel_package() {
+	lib32disabled=yes
+	short_desc+=" - Fortran language frontend - development files"
+	homepage="https://flang.llvm.org/"
+	depends="flang>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin/bbc
+		vmove usr/bin/f18-parse-demo
+		vmove usr/bin/fir-opt
+		vmove usr/bin/tco
+		vmove usr/include/flang
+		vmove usr/lib/cmake/flang
+		vmove usr/share/doc/LLVM/flang
+		vmove "usr/lib/libflang*.a"
+		vmove "usr/lib/libFIR*.a"
+		vmove "usr/lib/libHLFIR*.a"
+		vmove "usr/lib/libFortran*.a"
+	}
+}
+
+libomp_package() {
+	short_desc+=" - Clang OpenMP support library"
+	pkg_install() {
+		vmove "usr/lib/libomp*.so.*"
+	}
+}
+
+libomp-devel_package() {
+	short_desc+=" - Clang OpenMP support library - development files"
+	depends="libomp>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/bin/llvm-omp-device-info
+		vmove usr/bin/llvm-omp-kernel-replay
+		vmove "usr/lib/libarcher*.so"
+		vmove "usr/lib/libomp*.so"
+		vmove usr/lib/cmake/openmp
+		vmove usr/share/doc/LLVM/openmp
+		vmove usr/share/man/man1/llvmopenmp.1
+		if [ -z "$CROSS_BUILD" ]; then
+			vmove "usr/lib/libomptarget*.bc"
+			vmove "usr/lib/libarcher*.a"
+			vmove "usr/lib/libomp*.a"
+		fi
+	}
+}
+
+llvm-libunwind_package() {
+	short_desc+=" - libunwind"
+	pkg_install() {
+		vmove "usr/lib/libunwind.so.*"
+	}
+}
+
+llvm-libunwind-devel_package() {
+	short_desc+=" - libunwind - development files"
+	depends="llvm-libunwind>=${version}_${revision}"
+	conflicts="libunwind-devel>=0"
+	pkg_install() {
+		vmove usr/include/mach-o
+		vmove "usr/include/*unwind*"
+		vmove "usr/lib/libunwind.a"
+		vmove "usr/lib/libunwind.so"
+
+		LIBUNWIND_DOCS=usr/share/doc/LLVM/libunwind
+		vmkdir ${LIBUNWIND_DOCS}
+		vcopy ${wrksrc}/${build_wrksrc}/runtimes-doc/libunwind/docs/html ${LIBUNWIND_DOCS}
+	}
+}
+
+libcxxabi_package() {
+	short_desc+=" - low level support for libc++"
+	pkg_install() {
+		vmove "usr/lib/libc++abi.so.*"
+	}
+}
+
+libcxxabi-devel_package() {
+	short_desc+=" - low level support for libc++ - development files"
+	depends="libcxxabi>=${version}_${revision}"
+	pkg_install() {
+		vmove "usr/include/*cxxabi*"
+		vmove "usr/lib/libc++abi.so"
+		vmove "usr/lib/libc++abi.a"
+	}
+}
+
+libcxx_package() {
+	short_desc+=" - C++ standard library"
+	pkg_install() {
+		vmove "usr/lib/libc++.so.*"
+	}
+}
+
+libcxx-devel_package() {
+	short_desc+=" - C++ standard library - development files"
+	depends="libcxx>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include/c++
+		vmove "usr/lib/libc++.so"
+		vmove "usr/lib/libc++.a"
+		vmove "usr/lib/libc++experimental.a"
+
+		LIBCXX_DOCS=usr/share/doc/LLVM/libcxx
+		vmkdir ${LIBCXX_DOCS}
+		vcopy ${wrksrc}/${build_wrksrc}/runtimes-doc/libcxx/docs/html ${LIBCXX_DOCS}
+	}
+}
+
+libllvm_package() {
+	short_desc+=" - runtime library"
+	pkg_install() {
+		vmove "usr/lib/libLLVM-*.so*"
+	}
+}
+
+llvm-devel_package() {
+	pycompile_dirs="usr/share/opt-viewer"
+	short_desc+=" - development files"
+	depends="llvm17>=${version}_${revision}"
+	if [ "$build_option_openmp" ]; then
+		depends+=" libomp-devel>={$version}_${revision} "
+	fi
+	if [ "$build_option_mlir" ]; then
+		depends+=" mlir-devel>={$version}_${revision} "
+	fi
+	if [ "$build_option_clang" ]; then
+		depends+=" clang-devel>={$version}_${revision} "
+	fi
+	pkg_install() {
+		vmove usr/share/opt-viewer
+		vmove usr/include/llvm
+		vmove usr/include/llvm-c
+		vmove usr/share/doc/LLVM/llvm
+		vmove "usr/lib/libLLVM*.a"
+		vmove usr/lib/libLLVM.so
+		vmove usr/lib/libLTO.so
+		vmove usr/lib/libRemarks.so
+		vmove usr/lib/LLVMgold.so
+		vmove usr/lib/cmake/llvm
+
+		# Development Tools
+		vmove usr/bin/FileCheck
+		vmove usr/bin/UnicodeNameMappingGenerator
+		vmove usr/bin/bugpoint
+		vmove usr/bin/count
+		vmove usr/bin/dsymutil
+		vmove usr/bin/intercept-build
+		vmove usr/bin/llc
+		vmove usr/bin/lli
+		vmove usr/bin/lli-child-target
+		vmove usr/bin/not
+		vmove usr/bin/obj2yaml
+		vmove usr/bin/opt
+		vmove usr/bin/sancov
+		vmove usr/bin/sanstats
+		vmove usr/bin/split-file
+		vmove usr/bin/verify-uselistorder
+		vmove usr/bin/yaml-bench
+		vmove usr/bin/yaml2obj
+		vmove usr/bin/llvm-PerfectShuffle
+		vmove usr/bin/llvm-ar
+		vmove usr/bin/llvm-as
+		vmove usr/bin/llvm-bcanalyzer
+		vmove usr/bin/llvm-c-test
+		vmove usr/bin/llvm-cat
+		vmove usr/bin/llvm-cfi-verify
+		vmove usr/bin/llvm-config
+		vmove usr/bin/llvm-cov
+		vmove usr/bin/llvm-cvtres
+		vmove usr/bin/llvm-cxxdump
+		vmove usr/bin/llvm-cxxfilt
+		vmove usr/bin/llvm-cxxmap
+		vmove usr/bin/llvm-debuginfo-analyzer
+		vmove usr/bin/llvm-debuginfod
+		vmove usr/bin/llvm-debuginfod-find
+		vmove usr/bin/llvm-diff
+		vmove usr/bin/llvm-dis
+		vmove usr/bin/llvm-dwarfdump
+		vmove usr/bin/llvm-dwarfutil
+		vmove usr/bin/llvm-dwp
+		vmove usr/bin/llvm-exegesis
+		vmove usr/bin/llvm-extract
+		vmove usr/bin/llvm-gsymutil
+		vmove usr/bin/llvm-ifs
+		vmove usr/bin/llvm-jitlink
+		vmove usr/bin/llvm-jitlink-executor
+		vmove usr/bin/llvm-libtool-darwin
+		vmove usr/bin/llvm-link
+		vmove usr/bin/llvm-lipo
+		vmove usr/bin/llvm-lto
+		vmove usr/bin/llvm-lto2
+		vmove usr/bin/llvm-mc
+		vmove usr/bin/llvm-mca
+		vmove usr/bin/llvm-ml
+		vmove usr/bin/llvm-modextract
+		vmove usr/bin/llvm-mt
+		vmove usr/bin/llvm-nm
+		vmove usr/bin/llvm-objcopy
+		vmove usr/bin/llvm-objdump
+		vmove usr/bin/llvm-opt-report
+		vmove usr/bin/llvm-pdbutil
+		vmove usr/bin/llvm-profdata
+		vmove usr/bin/llvm-profgen
+		vmove usr/bin/llvm-rc
+		vmove usr/bin/llvm-readobj
+		vmove usr/bin/llvm-reduce
+		vmove usr/bin/llvm-remark-size-diff
+		vmove usr/bin/llvm-remarkutil
+		vmove usr/bin/llvm-rtdyld
+		vmove usr/bin/llvm-sim
+		vmove usr/bin/llvm-size
+		vmove usr/bin/llvm-split
+		vmove usr/bin/llvm-stress
+		vmove usr/bin/llvm-strings
+		vmove usr/bin/llvm-symbolizer
+		vmove usr/bin/llvm-tapi-diff
+		vmove usr/bin/llvm-tblgen
+		vmove usr/bin/llvm-tli-checker
+		vmove usr/bin/llvm-undname
+		vmove usr/bin/llvm-xray
+		vmove usr/bin/llvm-addr2line
+		vmove usr/bin/llvm-bitcode-strip
+		vmove usr/bin/llvm-dlltool
+		vmove usr/bin/llvm-install-name-tool
+		vmove usr/bin/llvm-lib
+		vmove usr/bin/llvm-otool
+		vmove usr/bin/llvm-ranlib
+		vmove usr/bin/llvm-readelf
+		vmove usr/bin/llvm-strip
+		vmove usr/bin/llvm-windres
+		vmove usr/share/man/man1/FileCheck.1
+		vmove usr/share/man/man1/bugpoint.1
+		vmove usr/share/man/man1/clang-tblgen.1
+		vmove usr/share/man/man1/dsymutil.1
+		vmove usr/share/man/man1/lit.1
+		vmove usr/share/man/man1/llc.1
+		vmove usr/share/man/man1/lldb-tblgen.1
+		vmove usr/share/man/man1/lli.1
+		vmove usr/share/man/man1/opt.1
+		vmove usr/share/man/man1/tblgen.1
+		vmove usr/share/man/man1/llvm-addr2line.1
+		vmove usr/share/man/man1/llvm-ar.1
+		vmove usr/share/man/man1/llvm-as.1
+		vmove usr/share/man/man1/llvm-bcanalyzer.1
+		vmove usr/share/man/man1/llvm-config.1
+		vmove usr/share/man/man1/llvm-cov.1
+		vmove usr/share/man/man1/llvm-cxxfilt.1
+		vmove usr/share/man/man1/llvm-cxxmap.1
+		vmove usr/share/man/man1/llvm-debuginfo-analyzer.1
+		vmove usr/share/man/man1/llvm-diff.1
+		vmove usr/share/man/man1/llvm-dis.1
+		vmove usr/share/man/man1/llvm-dwarfdump.1
+		vmove usr/share/man/man1/llvm-dwarfutil.1
+		vmove usr/share/man/man1/llvm-exegesis.1
+		vmove usr/share/man/man1/llvm-extract.1
+		vmove usr/share/man/man1/llvm-ifs.1
+		vmove usr/share/man/man1/llvm-install-name-tool.1
+		vmove usr/share/man/man1/llvm-lib.1
+		vmove usr/share/man/man1/llvm-libtool-darwin.1
+		vmove usr/share/man/man1/llvm-link.1
+		vmove usr/share/man/man1/llvm-lipo.1
+		vmove usr/share/man/man1/llvm-locstats.1
+		vmove usr/share/man/man1/llvm-mc.1
+		vmove usr/share/man/man1/llvm-mca.1
+		vmove usr/share/man/man1/llvm-nm.1
+		vmove usr/share/man/man1/llvm-objcopy.1
+		vmove usr/share/man/man1/llvm-objdump.1
+		vmove usr/share/man/man1/llvm-opt-report.1
+		vmove usr/share/man/man1/llvm-otool.1
+		vmove usr/share/man/man1/llvm-pdbutil.1
+		vmove usr/share/man/man1/llvm-profdata.1
+		vmove usr/share/man/man1/llvm-profgen.1
+		vmove usr/share/man/man1/llvm-ranlib.1
+		vmove usr/share/man/man1/llvm-readelf.1
+		vmove usr/share/man/man1/llvm-readobj.1
+		vmove usr/share/man/man1/llvm-reduce.1
+		vmove usr/share/man/man1/llvm-remark-size-diff.1
+		vmove usr/share/man/man1/llvm-remarkutil.1
+		vmove usr/share/man/man1/llvm-size.1
+		vmove usr/share/man/man1/llvm-stress.1
+		vmove usr/share/man/man1/llvm-strings.1
+		vmove usr/share/man/man1/llvm-strip.1
+		vmove usr/share/man/man1/llvm-symbolizer.1
+		vmove usr/share/man/man1/llvm-tblgen.1
+		vmove usr/share/man/man1/llvm-tli-checker.1
+	}
+}
diff --git a/srcpkgs/llvm17/update b/srcpkgs/llvm17/update
new file mode 100644
index 0000000000000..e95cf26b3586b
--- /dev/null
+++ b/srcpkgs/llvm17/update
@@ -0,0 +1,3 @@
+site="https://github.com/llvm/llvm-project/releases"
+pattern="llvmorg-\K(\d+.){2}\d+(-rc\d+)?"
+ignore="*-rc*"
diff --git a/srcpkgs/mlir b/srcpkgs/mlir
new file mode 120000
index 0000000000000..96970d5c02c13
--- /dev/null
+++ b/srcpkgs/mlir
@@ -0,0 +1 @@
+llvm17
\ No newline at end of file
diff --git a/srcpkgs/mlir-devel b/srcpkgs/mlir-devel
new file mode 120000
index 0000000000000..96970d5c02c13
--- /dev/null
+++ b/srcpkgs/mlir-devel
@@ -0,0 +1 @@
+llvm17
\ No newline at end of file

From b4b51bab5bf86819f392a91abb2a907d4cddc768 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 Nov 2023 11:07:35 -0400
Subject: [PATCH 02/44] CastXML: update to 0.6.2.

---
 srcpkgs/CastXML/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/CastXML/template b/srcpkgs/CastXML/template
index de0920900ae4c..8efb70113fb30 100644
--- a/srcpkgs/CastXML/template
+++ b/srcpkgs/CastXML/template
@@ -1,11 +1,11 @@
 # Template file for 'CastXML'
 pkgname=CastXML
-version=0.5.1
-revision=2
+version=0.6.2
+revision=1
 build_style=cmake
 configure_args="-DSPHINX_MAN=YES -DCastXML_INSTALL_MAN_DIR=share/man"
 hostmakedepends="clang python3-Sphinx"
-makedepends="clang-tools-extra llvm"
+makedepends="clang-tools-extra llvm-devel"
 depends="clang"
 checkdepends="libxml2"
 short_desc="C-family abstract syntax tree XML output tool"
@@ -13,7 +13,7 @@ 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/refs/tags/v${version}.tar.gz"
-checksum=a7b40b1530585672f9cf5d7a6b6dd29f20c06cd5edf34ef34c89a184a4d1a006
+checksum=9bb108de1b3348a257be5b08a9f8418f89fdcd4af2e6ee271d68b0203ac75d5e
 
 post_install() {
 	rm -r ${DESTDIR}/usr/share/castxml/clang/include

From 06e4dbed0703f6214fbbfdbae402840a9002a0a0 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 Nov 2023 11:07:50 -0400
Subject: [PATCH 03/44] bpftrace: rebuild for llvm17

---
 srcpkgs/bpftrace/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index 6b2d4ac25fc07..ff0808df4462c 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,7 +1,7 @@
 # Template file for 'bpftrace'
 pkgname=bpftrace
 version=0.20.0
-revision=1
+revision=2
 archs="x86_64* aarch64* ppc64*"
 build_style=cmake
 configure_args="-DUSE_SYSTEM_BPF_BCC=ON -DBUILD_TESTING=OFF" # needs root to run

From 6a3ec5558ab61c4939cb218d7b439a8d3d0186cf Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 Nov 2023 11:28:31 -0400
Subject: [PATCH 04/44] SPIRV-Tools: rebuild for llvm17

---
 srcpkgs/SPIRV-Tools/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/SPIRV-Tools/template b/srcpkgs/SPIRV-Tools/template
index 09a96c61ca504..5aba11a4a431f 100644
--- a/srcpkgs/SPIRV-Tools/template
+++ b/srcpkgs/SPIRV-Tools/template
@@ -1,6 +1,6 @@
 # Template file for 'SPIRV-Tools'
 pkgname=SPIRV-Tools
-version=2022.4
+version=2023.5
 revision=1
 build_style=cmake
 configure_args="-DSPIRV_SKIP_TESTS=ON -DSPIRV_WERROR=OFF
@@ -12,8 +12,8 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/KhronosGroup/SPIRV-Tools"
 changelog="https://raw.githubusercontent.com/KhronosGroup/SPIRV-Tools/master/CHANGES"
-distfiles="https://github.com/KhronosGroup/SPIRV-Tools/archive/v${version}.tar.gz"
-checksum=a156215a2d7c6c5b267933ed691877a9a66f07d75970da33ce9ad627a71389d7
+distfiles="https://api.github.com/repos/KhronosGroup/SPIRV-Tools/tarball/vulkan-sdk-1.3.268.0>${version}.tar.gz"
+checksum=eb560857e21876561e9e738ae8c9d6f42038366f90b2564be067cf020627e722
 LDFLAGS="-Wl,--no-undefined"
 
 SPIRV-Tools-devel_package() {

From ae87c4038f8e0aeee3c8d27c7effa7f9353c9835 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 Nov 2023 11:50:16 -0400
Subject: [PATCH 05/44] SPIRV-LLVM-Translator: update to 17.0.0.

---
 common/shlibs                          | 2 +-
 srcpkgs/SPIRV-LLVM-Translator/template | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 26204361d967e..050b15a8a4f83 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -992,7 +992,7 @@ libLLVM-11.so libllvm11-11.0.0_1
 libLLVM-12.so libllvm12-12.0.0_1
 libLLVM-15.so libllvm15-15.0.7_4
 libLLVM-17.so libllvm-17.0.3_1
-libLLVMSPIRVLib.so.15 SPIRV-LLVM-Translator-15.0.0_1
+libLLVMSPIRVLib.so.17 SPIRV-LLVM-Translator-17.0.0_1
 libomp.so.5 libomp-17.0.6_1
 libomptarget.so.15 libomp15-15.0.7_4
 libomptarget.so.17 libomp-17.0.3_1
diff --git a/srcpkgs/SPIRV-LLVM-Translator/template b/srcpkgs/SPIRV-LLVM-Translator/template
index bee99f9bcbb26..65c609bdc9294 100644
--- a/srcpkgs/SPIRV-LLVM-Translator/template
+++ b/srcpkgs/SPIRV-LLVM-Translator/template
@@ -1,6 +1,6 @@
 # Template file for 'SPIRV-LLVM-Translator'
 pkgname=SPIRV-LLVM-Translator
-version=15.0.0
+version=17.0.0
 revision=1
 build_style=cmake
 make_build_args="llvm-spirv"
@@ -14,7 +14,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="NCSA"
 homepage="https://github.com/KhronosGroup/SPIRV-LLVM-Translator"
 distfiles="https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/refs/tags/v${version}.tar.gz"
-checksum=b1bebd77f72988758c00852e78c2ddc545815a612169a0cb377d021e2f846d88
+checksum=eba381e1dd99b4ff6c672a28f52755d1adf2d810a97b51e6074ad4fa67937fb2
 
 post_install() {
 	vlicense LICENSE.TXT

From 06903768a2374c243030a5e7eb13d54279715f09 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 31 Jan 2024 18:13:47 -0500
Subject: [PATCH 06/44] spirv-llvm

---
 srcpkgs/SPIRV-LLVM-Translator/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/SPIRV-LLVM-Translator/template b/srcpkgs/SPIRV-LLVM-Translator/template
index 65c609bdc9294..a34368ee7797f 100644
--- a/srcpkgs/SPIRV-LLVM-Translator/template
+++ b/srcpkgs/SPIRV-LLVM-Translator/template
@@ -7,8 +7,8 @@ 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_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=/usr"
-hostmakedepends="clang llvm"
-makedepends="clang-tools-extra llvm SPIRV-Headers"
+hostmakedepends="clang llvm-devel"
+makedepends="clang-tools-extra llvm-devel SPIRV-Headers"
 short_desc="API and commands for processing SPIR-V modules"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="NCSA"

From 22e6df15102386be8f572c36d1f09623b8a298da Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 Nov 2023 11:50:23 -0400
Subject: [PATCH 07/44] SPIRV-Headers: update to 1.3.268.0.

---
 srcpkgs/SPIRV-Headers/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/SPIRV-Headers/template b/srcpkgs/SPIRV-Headers/template
index 2457d5411aebe..6527729b3980b 100644
--- a/srcpkgs/SPIRV-Headers/template
+++ b/srcpkgs/SPIRV-Headers/template
@@ -1,15 +1,15 @@
 # Template file for 'SPIRV-Headers'
 pkgname=SPIRV-Headers
 reverts="1.5.4.raytracing.fixed_1 1.5.3_2 1.5.3_1 1.5.1_1 1.4.1_1"
-version=1.3.231.1
+version=1.3.268.0
 revision=1
 build_style=cmake
 short_desc="Machine-readable files for the SPIR-V Registry"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="https://github.com/KhronosGroup/SPIRV-Headers"
-distfiles="https://github.com/KhronosGroup/SPIRV-Headers/archive/sdk-${version}.tar.gz"
-checksum=fc340700b005e9a2adc98475b5afbbabd1bc931f789a2afd02d54ebc22522af3
+distfiles="https://github.com/KhronosGroup/SPIRV-Headers/archive/vulkan-sdk-${version}.tar.gz"
+checksum=1022379e5b920ae21ccfb5cb41e07b1c59352a18c3d3fdcbf38d6ae7733384d4
 
 post_install() {
 	vlicense LICENSE

From 131e7cb4d5c26c163f5aba4f55ac18c75f00a0e2 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 Nov 2023 14:49:45 -0400
Subject: [PATCH 08/44] mesa: rebuild for llvm17

---
 srcpkgs/mesa/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/mesa/template b/srcpkgs/mesa/template
index 05a35dce0d1a9..9985f41576bdb 100644
--- a/srcpkgs/mesa/template
+++ b/srcpkgs/mesa/template
@@ -1,19 +1,19 @@
 # Template file for 'mesa'
 pkgname=mesa
 version=23.3.2
-revision=1
+revision=2
 build_style=meson
 #Disable LTO flag should be present, see https://gitlab.freedesktop.org/mesa/mesa/-/issues/6911
 configure_args="-Dglvnd=true -Dshared-glapi=enabled -Dgbm=enabled -Degl=enabled
  -Dosmesa=true -Dgles1=enabled -Dgles2=enabled -Dglx=dri -Ddri3=enabled
  -Dlmsensors=enabled -Dplatforms=x11$(vopt_if wayland ,wayland)
  -Dllvm=enabled -Db_lto=false -Dcpp_std=gnu++17"
-hostmakedepends="gettext flex llvm pkg-config python3-Mako glslang
+hostmakedepends="gettext flex llvm-devel pkg-config python3-Mako glslang
  $(vopt_if wayland 'wayland-protocols wayland-devel')"
 makedepends="elfutils-devel expat-devel libXdamage-devel
  libXxf86vm-devel libdrm-devel libffi-devel libva-devel
  libvdpau-devel libxshmfence-devel ncurses-devel zlib-devel
- $(vopt_if wayland 'wayland-devel wayland-protocols') llvm libsensors-devel
+ $(vopt_if wayland 'wayland-devel wayland-protocols') llvm-devel libsensors-devel
  libXrandr-devel libglvnd-devel libzstd-devel libxml2-devel lua53-devel
  libarchive-devel"
 depends="libglvnd"

From f36c89e8a8485ce0f7a1e0913ff23228a9cd9df1 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 Nov 2023 16:51:08 -0400
Subject: [PATCH 09/44] ccls: rebuild for llvm17

---
 srcpkgs/ccls/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/ccls/template b/srcpkgs/ccls/template
index 9c1338c267372..d0b21fa9cbb1d 100644
--- a/srcpkgs/ccls/template
+++ b/srcpkgs/ccls/template
@@ -1,7 +1,7 @@
 # Template file for 'ccls'
 pkgname=ccls
 version=0.20230717
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DUSE_SYSTEM_RAPIDJSON=ON"
 hostmakedepends="clang-tools-extra"

From 8bd8252cbd5af7151683f5364992ec6d6ed4e732 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 Nov 2023 17:49:25 -0400
Subject: [PATCH 10/44] clazy: rebuild for llvm17

---
 srcpkgs/clazy/patches/llvm16.patch | 83 ++++++++++++++++++++++++++++++
 srcpkgs/clazy/patches/llvm17.patch | 28 ++++++++++
 srcpkgs/clazy/template             |  6 +--
 3 files changed, 114 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/clazy/patches/llvm16.patch
 create mode 100644 srcpkgs/clazy/patches/llvm17.patch

diff --git a/srcpkgs/clazy/patches/llvm16.patch b/srcpkgs/clazy/patches/llvm16.patch
new file mode 100644
index 0000000000000..a5759060c112d
--- /dev/null
+++ b/srcpkgs/clazy/patches/llvm16.patch
@@ -0,0 +1,83 @@
+From a05ac7eb6f6198c3f478bd7b5b4bfc062a8d63cc Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ivan=20=C4=8Cuki=C4=87?= <ivan.cukic@kdab.com>
+Date: Tue, 7 Feb 2023 11:06:19 +0100
+Subject: [PATCH] Adapt to API changes in clang/llvm 16
+
+---
+ src/SourceCompatibilityHelpers.h        | 17 ++++++++++++-----
+ src/checkbase.h                         |  1 +
+ src/checks/level0/lambda-in-connect.cpp |  2 +-
+ 3 files changed, 14 insertions(+), 6 deletions(-)
+
+diff --git a/src/SourceCompatibilityHelpers.h b/src/SourceCompatibilityHelpers.h
+index c1a23a4b..5e2dc606 100644
+--- a/src/SourceCompatibilityHelpers.h
++++ b/src/SourceCompatibilityHelpers.h
+@@ -107,7 +107,11 @@ inline clang::tooling::Replacements& DiagnosticFix(clang::tooling::Diagnostic &d
+ 
+ inline auto getBuffer(const clang::SourceManager &sm, clang::FileID id, bool *invalid)
+ {
+-#if LLVM_VERSION_MAJOR >= 12
++#if LLVM_VERSION_MAJOR >= 16
++    auto buffer = sm.getBufferOrNone(id);
++    *invalid = !buffer.has_value();
++    return buffer;
++#elif LLVM_VERSION_MAJOR >= 12
+     auto buffer = sm.getBufferOrNone(id);
+     *invalid = !buffer.hasValue();
+     return buffer;
+@@ -116,11 +120,12 @@ inline auto getBuffer(const clang::SourceManager &sm, clang::FileID id, bool *in
+ #endif
+ }
+ 
+-#if LLVM_VERSION_MAJOR >= 12
+-
++#if LLVM_VERSION_MAJOR >= 16
++#define GET_LEXER(id, inputFile, sm, lo) \
++clang::Lexer(id, inputFile.value(), sm, lo)
++#elif LLVM_VERSION_MAJOR >= 12
+ #define GET_LEXER(id, inputFile, sm, lo) \
+ clang::Lexer(id, inputFile.getValue(), sm, lo)
+-
+ #else
+ #define GET_LEXER(id, inputFile, sm, lo) \
+ clang::Lexer(id, inputFile, sm, lo)
+@@ -144,7 +149,9 @@ inline bool contains_lower(clang::StringRef haystack, clang::StringRef needle)
+ #endif
+ }
+ 
+-#if LLVM_VERSION_MAJOR >= 15
++#if LLVM_VERSION_MAJOR >= 16
++using OptionalFileEntryRef = clang::CustomizableOptional<clang::FileEntryRef>;
++#elif LLVM_VERSION_MAJOR >= 15
+ using OptionalFileEntryRef = clang::Optional<clang::FileEntryRef>;
+ #else
+ using OptionalFileEntryRef = const clang::FileEntry*;
+diff --git a/src/checkbase.h b/src/checkbase.h
+index 02f6a6bf..6a8c634b 100644
+--- a/src/checkbase.h
++++ b/src/checkbase.h
+@@ -93,6 +93,7 @@ public:
+     void InclusionDirective(clang::SourceLocation HashLoc, const clang::Token &IncludeTok, clang::StringRef FileName, bool IsAngled,
+                             clang::CharSourceRange FilenameRange, clazy::OptionalFileEntryRef File, clang::StringRef SearchPath,
+                             clang::StringRef RelativePath, const clang::Module *Imported, clang::SrcMgr::CharacteristicKind FileType) override;
++
+ private:
+     CheckBase *const check;
+ };
+diff --git a/src/checks/level0/lambda-in-connect.cpp b/src/checks/level0/lambda-in-connect.cpp
+index b0da926f..1ba1126f 100644
+--- a/src/checks/level0/lambda-in-connect.cpp
++++ b/src/checks/level0/lambda-in-connect.cpp
+@@ -71,7 +71,7 @@ void LambdaInConnect::VisitStmt(clang::Stmt *stmt)
+ 
+     for (auto capture : captures) {
+         if (capture.getCaptureKind() == clang::LCK_ByRef) {
+-            VarDecl *declForCapture = capture.getCapturedVar();
++            auto *declForCapture = capture.getCapturedVar();
+             if (declForCapture && declForCapture != receiverDecl && clazy::isValueDeclInFunctionContext(declForCapture))
+                 emitWarning(capture.getLocation(), "captured local variable by reference might go out of scope before lambda is called");
+         }
+-- 
+GitLab
+
diff --git a/srcpkgs/clazy/patches/llvm17.patch b/srcpkgs/clazy/patches/llvm17.patch
new file mode 100644
index 0000000000000..910ab426070d9
--- /dev/null
+++ b/srcpkgs/clazy/patches/llvm17.patch
@@ -0,0 +1,28 @@
+--- a/src/checks/manuallevel/unexpected-flag-enumerator-value.cpp	2022-01-20 18:18:47.000000000 -0500
++++ b/src/checks/manuallevel/unexpected-flag-enumerator-value.cpp	2023-11-03 17:12:24.669027622 -0400
+@@ -61,8 +61,13 @@
+     if (val.isMask() && val.countTrailingOnes() >= MinOnesToQualifyAsMask)
+         return true;
+ 
++#if LLVM_VERSION_MAJOR >= 17
++    if (val.isShiftedMask() && val.popcount() >= MinOnesToQualifyAsMask)
++        return true;
++#else
+     if (val.isShiftedMask() && val.countPopulation() >= MinOnesToQualifyAsMask)
+         return true;
++#endif
+ 
+     if (clazy::contains_lower(en->getName(), "mask"))
+         return true;
+@@ -158,7 +163,11 @@
+ 
+     for (EnumConstantDecl* enumerator : enumerators) {
+         const auto &initVal = enumerator->getInitVal();
++#if LLVM_VERSION_MAJOR >= 17
++        if (!initVal.isPowerOf2() && !initVal.isZero() && !initVal.isNegative()) {
++#else
+         if (!initVal.isPowerOf2() && !initVal.isNullValue() && !initVal.isNegative()) {
++#endif
+             if (isIntentionallyNotPowerOf2(enumerator))
+                 continue;
+             const auto value = enumerator->getInitVal().getLimitedValue();
diff --git a/srcpkgs/clazy/template b/srcpkgs/clazy/template
index f81de08ab836f..62ac45e1b933a 100644
--- a/srcpkgs/clazy/template
+++ b/srcpkgs/clazy/template
@@ -1,11 +1,11 @@
 # Template file for 'clazy'
 pkgname=clazy
 version=1.11
-revision=2
+revision=3
 build_style=cmake
 build_helper=qemu
-hostmakedepends="llvm"
-makedepends="clang llvm clang-tools-extra"
+hostmakedepends="llvm-devel"
+makedepends="clang llvm-devel clang-tools-extra"
 depends="clang"
 short_desc="Qt oriented code checker based on clang framework"
 maintainer="John <me@johnnynator.dev>"

From 9fe38d2a780f13b21e57a93e82c89a21dd1e1a59 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 Nov 2023 18:03:22 -0400
Subject: [PATCH 11/44] codelite: rebuild for llvm17

---
 srcpkgs/codelite/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/codelite/template b/srcpkgs/codelite/template
index f8206426888fd..ea61ee6e27507 100644
--- a/srcpkgs/codelite/template
+++ b/srcpkgs/codelite/template
@@ -1,7 +1,7 @@
 # Template file for 'codelite'
 pkgname=codelite
 version=16.0.0
-revision=4
+revision=5
 create_wrksrc=yes
 build_style=cmake
 build_helper=cmake-wxWidgets-gtk3

From fbf57dedd08590b63ed27882cfd9bbf79cb8cd77 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 Nov 2023 18:59:45 -0400
Subject: [PATCH 12/44] gnome-builder: rebuild for llvm17

---
 srcpkgs/gnome-builder/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/gnome-builder/template b/srcpkgs/gnome-builder/template
index a85de84f5dd0d..e75cb131ff4b5 100644
--- a/srcpkgs/gnome-builder/template
+++ b/srcpkgs/gnome-builder/template
@@ -1,12 +1,12 @@
 # Template file for 'gnome-builder'
 pkgname=gnome-builder
 version=44.1
-revision=5
+revision=6
 build_style=meson
 build_helper=qemu
 configure_args="-Dhelp=true -Dnetwork_tests=false"
 hostmakedepends="pkg-config appstream-glib desktop-file-utils flex gobject-introspection
- llvm mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
+ llvm-devel mm-common vala python3-Sphinx python3-sphinx_rtd_theme gettext"
 makedepends="cairo-devel clang enchant2-devel flatpak-devel
  gtksourceview5-devel gtk4-devel json-glib-devel jsonrpc-glib-devel
  libgit2-glib-devel libglib-devel libostree-devel libpeas-devel

From 9f080d381963e3d0f865a2c841274bb1bf34cb4b Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 Nov 2023 19:03:19 -0400
Subject: [PATCH 13/44] include-what-you-use: update to 0.20.

---
 srcpkgs/include-what-you-use/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/include-what-you-use/template b/srcpkgs/include-what-you-use/template
index 1a30bc04bb2db..1b8b034641953 100644
--- a/srcpkgs/include-what-you-use/template
+++ b/srcpkgs/include-what-you-use/template
@@ -1,17 +1,17 @@
 # Template file for 'include-what-you-use'
 pkgname=include-what-you-use
-version=0.19
+version=0.20
 revision=1
 build_style=cmake
 configure_args="-DIWYU_LLVM_ROOT_PATH=${XBPS_CROSS_BASE}/usr "
 hostmakedepends="python3"
-makedepends="clang clang-tools-extra llvm ncurses-devel zlib-devel"
+makedepends="clang clang-tools-extra llvm-devel ncurses-devel zlib-devel"
 short_desc="Analyze #includes in C and C++ source files"
 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=2b10157b60ea08adc08e3896b4921c73fcadd5ec4eb652b29a34129d501e5ee0
+checksum=75fce1e6485f280f8f13f4c2d090b11d2fd2102b50857507c8413a919b7af899
 python_version=3
 
 post_install() {

From 468024b085f346eaf1ba132d1aadcae388b2583e Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 Nov 2023 19:05:52 -0400
Subject: [PATCH 14/44] juCi++: rebuild for llvm17

---
 srcpkgs/juCi++/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template
index 4cb4644663800..4b40d142462dc 100644
--- a/srcpkgs/juCi++/template
+++ b/srcpkgs/juCi++/template
@@ -1,7 +1,7 @@
 # Template file for 'juCi++'
 pkgname=juCi++
 version=1.7.2
-revision=6
+revision=7
 _libclangmm_commit="9704b9b6de0982a588fa41741157d5640afedf30"
 _tiny_commit="839ff806dc447ff49af80f9a9eaa7949f770f8e5"
 create_wrksrc=yes

From 869c5aa6438dcd22e41b684c14b09c76ecd19aea Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 Nov 2023 20:27:29 -0400
Subject: [PATCH 15/44] kdevelop: update to 23.08.4.

---
 common/shlibs             | 32 ++++++++++++++++----------------
 srcpkgs/kdevelop/template | 10 +++++-----
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index 050b15a8a4f83..df2e82b8e1494 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2613,22 +2613,22 @@ libvidstab.so.1.1 libvidstab-1.1.0_1
 libxdo.so.3 xdotool-3.20150503.1_1
 libabigail.so.3 libabigail-2.4_1
 libgnome-games-support-1.so.3 libgnome-games-support-1.4.0_1
-libKDevCMakeCommon.so.510 kdevelop-22.12.1_1
-libKDevClangPrivate.so.510 kdevelop-22.12.1_1
-libKDevCompileAnalyzerCommon.so.510 kdevelop-22.12.1_1
-libKDevelopSessionsWatch.so.510 kdevelop-22.12.1_1
-libKDevPlatformDebugger.so.510 kdevelop-22.12.1_1
-libKDevPlatformDocumentation.so.510 kdevelop-22.12.1_1
-libKDevPlatformInterfaces.so.510 kdevelop-22.12.1_1
-libKDevPlatformLanguage.so.510 kdevelop-22.12.1_1
-libKDevPlatformOutputView.so.510 kdevelop-22.12.1_1
-libKDevPlatformProject.so.510 kdevelop-22.12.1_1
-libKDevPlatformSerialization.so.510 kdevelop-22.12.1_1
-libKDevPlatformShell.so.510 kdevelop-22.12.1_1
-libKDevPlatformSublime.so.510 kdevelop-22.12.1_1
-libKDevPlatformTests.so.510 kdevelop-22.12.1_1
-libKDevPlatformUtil.so.510 kdevelop-22.12.1_1
-libKDevPlatformVcs.so.510 kdevelop-22.12.1_1
+libKDevCMakeCommon.so.512 kdevelop-23.08.2_1
+libKDevClangPrivate.so.512 kdevelop-23.08.2_1
+libKDevCompileAnalyzerCommon.so.512 kdevelop-23.08.2_1
+libKDevelopSessionsWatch.so.512 kdevelop-23.08.2_1
+libKDevPlatformDebugger.so.512 kdevelop-23.08.2_1
+libKDevPlatformDocumentation.so.512 kdevelop-23.08.2_1
+libKDevPlatformInterfaces.so.512 kdevelop-23.08.2_1
+libKDevPlatformLanguage.so.512 kdevelop-23.08.2_1
+libKDevPlatformOutputView.so.512 kdevelop-23.08.2_1
+libKDevPlatformProject.so.512 kdevelop-23.08.2_1
+libKDevPlatformSerialization.so.512 kdevelop-23.08.2_1
+libKDevPlatformShell.so.512 kdevelop-23.08.2_1
+libKDevPlatformSublime.so.512 kdevelop-23.08.2_1
+libKDevPlatformTests.so.512 kdevelop-23.08.2_1
+libKDevPlatformUtil.so.512 kdevelop-23.08.2_1
+libKDevPlatformVcs.so.512 kdevelop-23.08.2_1
 libts.so.0 tslib-1.6_1
 libobs.so.0 obs-0.14.1_2
 libobsglad.so.1 obs-28.0.1_1
diff --git a/srcpkgs/kdevelop/template b/srcpkgs/kdevelop/template
index b2c63eb78151a..e3fc424d535b9 100644
--- a/srcpkgs/kdevelop/template
+++ b/srcpkgs/kdevelop/template
@@ -1,15 +1,15 @@
 # Template file for 'kdevelop'
 pkgname=kdevelop
-version=22.12.2
-revision=2
+version=23.08.4
+revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 hostmakedepends="extra-cmake-modules qt5-qmake qt5-host-tools qt5-tools
- kcmutils kcoreaddons kdevelop-pg-qt plasma-framework gettext llvm tar which"
+ kcmutils kcoreaddons kdevelop-pg-qt plasma-framework gettext llvm-devel tar which"
 makedepends="apr-util-devel clang grantlee5-devel kcmutils-devel kdevelop-pg-qt
  kitemmodels-devel knewstuff-devel knotifyconfig-devel krunner-devel
  ktexteditor-devel libkomparediff2-devel libksysguard-devel okteta-devel
- purpose-devel qt5-location-devel qt5-webchannel-devel subversion-devel
+ purpose-devel qt5-location-devel qt5-webchannel-devel subversion-devel clang-tools-extra
  qt5-devel $(vopt_if webengine 'qt5-webengine-devel' 'qt5-webkit-devel')"
 # khelpcenter is required to display documentation
 depends="khelpcenter"
@@ -19,7 +19,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="https://www.kdevelop.org/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kdevelop"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdevelop-${version}.tar.xz"
-checksum=57f85e5eb1be0ae71d3440304c985fff2be03aab02de367535568ccef7c25ec9
+checksum=91d02b2bce8f29113054ccc548e6416d94065cf79919c54075bad19599357af0
 
 build_options="webengine"
 desc_option_webengine="Use Qt5 WebEngine for documentation"

From 2f90d8a95e27238e80b86d210395906c2350397d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 Nov 2023 20:35:06 -0400
Subject: [PATCH 16/44] kdevelop-php: update to 23.08.4.

---
 srcpkgs/kdevelop-php/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/kdevelop-php/template b/srcpkgs/kdevelop-php/template
index 7df97b8d78845..4f3bafe2356d0 100644
--- a/srcpkgs/kdevelop-php/template
+++ b/srcpkgs/kdevelop-php/template
@@ -1,6 +1,6 @@
 # Template file for 'kdevelop-php'
 pkgname=kdevelop-php
-version=22.12.2
+version=23.08.4
 revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
@@ -15,4 +15,4 @@ license="GPL-2.0-or-later, LGPL-2.0-or-later"
 homepage="https://www.kdevelop.org/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kdev-php"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdev-php-${version}.tar.xz"
-checksum=0df5bdebfffe72cc4ae5bc842418ac30908fbaa4ae5c8762a9c4ad361c3e42b7
+checksum=20c097ff322db3d69a57d45980161ed1d72020a95fc52feb46d3fc38ba340fd0

From 4c7a5f851765ed9c64762ffdbefd0bd668998a26 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 Nov 2023 20:36:53 -0400
Subject: [PATCH 17/44] kdevelop-python: update to 23.08.4.

---
 srcpkgs/kdevelop-python/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/kdevelop-python/template b/srcpkgs/kdevelop-python/template
index 0f0b8a6ec0671..e3d86278ffe63 100644
--- a/srcpkgs/kdevelop-python/template
+++ b/srcpkgs/kdevelop-python/template
@@ -1,7 +1,7 @@
 # Template file for 'kdevelop-python'
 pkgname=kdevelop-python
-version=22.12.2
-revision=2
+version=23.08.4
+revision=1
 build_style=cmake
 configure_args="-DBUILD_TESTING=OFF"
 pycompile_dirs="usr/share/kdevpythonsupport"
@@ -16,7 +16,7 @@ license="LGPL-2.0-or-later, GPL-2.0-or-later"
 homepage="https://www.kdevelop.org/"
 changelog="https://kde.org/announcements/changelogs/gear/${version}/#kdev-python"
 distfiles="${KDE_SITE}/release-service/${version}/src/kdev-python-${version}.tar.xz"
-checksum=2521f2f2a7174dfb2bf1d962c460d40addc3bb486e9823c2b2707ced33456430
+checksum=a36ec94c241714c0c1f5787bafa2381c5d4ec20a3e3696bed70d13b1bd49b293
 python_version=3
 
 post_install() {

From 15830ec56b5bb5e2bb58f4982cb5cfd7a1a364f3 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 Nov 2023 20:56:42 -0400
Subject: [PATCH 18/44] ldc: Rebuild with old llvm15

---
 common/shlibs        | 4 ----
 srcpkgs/ldc/template | 6 +++---
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/common/shlibs b/common/shlibs
index df2e82b8e1494..251e463c070e7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2148,10 +2148,6 @@ libphobos2-ldc-shared.so.101 ldc-runtime-1.31.0_1
 libphobos2-ldc-debug-shared.so.101 ldc-runtime-1.31.0_1
 libFcitx5Qt6DBusAddons.so.1 fcitx5-qt6-5.1.4_1
 libFcitx5Qt6WidgetsAddons.so.2 fcitx5-qt6-5.1.4_1
-libdruntime-ldc-shared.so.105 ldc-runtime-1.35.0_1
-libphobos2-ldc-shared.so.105 ldc-runtime-1.35.0_1
-libdruntime-ldc-debug-shared.so.105 ldc-runtime-debug-1.35.0_1
-libphobos2-ldc-debug-shared.so.105 ldc-runtime-debug-1.35.0_1
 libmarblewidget-qt5.so.28 marble5-17.12.2_1
 libastro.so.2 marble5-17.12.2_1
 libparrot.so.6.9.0 parrot-6.9.0_1
diff --git a/srcpkgs/ldc/template b/srcpkgs/ldc/template
index f6d8b7ffbe985..c95ed661f6cff 100644
--- a/srcpkgs/ldc/template
+++ b/srcpkgs/ldc/template
@@ -1,7 +1,7 @@
 # Template file for 'ldc'
 pkgname=ldc
 version=1.31.0
-revision=1
+revision=2
 build_style=cmake
 configure_args="
  -DINCLUDE_INSTALL_DIR=/usr/include/dlang/ldc
@@ -13,8 +13,8 @@ configure_args="
 conf_files="/etc/ldc2.conf"
 hostmakedepends="dmd llvm15 perl pkg-config"
 makedepends="libcurl-devel libffi-devel ncurses-devel zlib-devel
- llvm-libunwind-devel"
-depends="ldc-runtime llvm-libunwind-devel"
+ llvm-libunwind15-devel"
+depends="ldc-runtime llvm-libunwind15-devel"
 checkdepends="python3"
 short_desc="Portable D programming language compiler based on LLVM"
 maintainer="Auri <me@aurieh.me>"

From f3d504288a43e2f56a648fd4eeb7ee909c4f4954 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 Nov 2023 21:06:14 -0400
Subject: [PATCH 19/44] qt6-tools: rebuild for llvm17

---
 srcpkgs/qt6-tools/template | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qt6-tools/template b/srcpkgs/qt6-tools/template
index 3f430540ed68a..4cdd6307260f8 100644
--- a/srcpkgs/qt6-tools/template
+++ b/srcpkgs/qt6-tools/template
@@ -1,19 +1,19 @@
 # Template file for 'qt6-tools'
 pkgname=qt6-tools
 version=6.6.0
-revision=1
+revision=3
 build_style=cmake
 configure_args="-DEXTERNAL_GUMBO=ON -DLITEHTML_UTF8=ON -DUSE_ICU=ON
  -DQT_BUILD_SHARED_LIBS=ON -DQT_FEATURE_assistant=ON
  -DQT_FEATURE_pixeltool=ON
  -DQT_FEATURE_distancefieldgenerator=ON"
-hostmakedepends="qt6-base perl qt6-plugin-sqlite clang llvm clang-tools-extra
+hostmakedepends="qt6-base perl qt6-plugin-sqlite clang llvm-devel clang-tools-extra
  qt6-declarative-host-tools"
 makedepends="qt6-base-devel qt6-plugin-sqlite qt6-declarative-devel
- gumbo-parser-devel icu-devel llvm clang-tools-extra"
+ gumbo-parser-devel icu-devel llvm-devel clang-tools-extra"
 short_desc="Cross-platform application and UI framework (QT6) - qt6-tools component"
 maintainer="John <me@johnnynator.dev>"
-license="GPL-3.0-only with Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
+license="custom:GPL-3.0-only-with-Qt-GPL-exception-1.0, LGPL-3.0-only, GPL-2.0-or-later"
 homepage="https://qt.io/"
 distfiles="http://download.qt.io/official_releases/qt/${version%.*}/${version}/submodules/qttools-everywhere-src-${version}.tar.xz"
 checksum=4e9feebc142bbb6e453e1dc3277e09ec45c8ef081b5ee2a029e6684b5905ba99
@@ -28,6 +28,10 @@ if [ "$XBPS_CHECK_PKGS" ]; then
 	configure_args+=" -DQT_BUILD_TESTS=ON"
 fi
 
+post_install() {
+	vlicense LICENSES/Qt-GPL-exception-1.0.txt
+}
+
 #post_build() {
 #	ninja -C build ${makejobs} lib/qt6/libexec/qhelpgenerator
 #}

From 78d9067b453a2be449296543417e44396447c564 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 Nov 2023 21:08:10 -0400
Subject: [PATCH 20/44] rtags: rebuild for llvm17

---
 srcpkgs/rtags/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rtags/template b/srcpkgs/rtags/template
index 9b161e690d767..3cbc4a23aa62b 100644
--- a/srcpkgs/rtags/template
+++ b/srcpkgs/rtags/template
@@ -1,12 +1,12 @@
 # Template file for 'rtags'
 pkgname=rtags
 version=2.38
-revision=6
+revision=7
 build_style=cmake
 # Don't run tests in do_install, please.
 configure_args="-DSKIP_CTEST=TRUE"
 hostmakedepends="pkg-config clang"
-makedepends="llvm openssl-devel zlib-devel"
+makedepends="llvm-devel openssl-devel zlib-devel"
 checkdepends="perl python3-PyHamcrest python3-nose"
 short_desc="C/C++ indexer with integration for Emacs based on clang"
 maintainer="Alexander Egorenkov <egorenar-dev@posteo.net>"

From cff5f931dea181e1be066baf0c393a40d70e23f6 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 Nov 2023 21:11:23 -0400
Subject: [PATCH 21/44] shiboken2: rebuild for llvm17

---
 srcpkgs/shiboken2/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/shiboken2/template b/srcpkgs/shiboken2/template
index 883d6a084d868..80b156e616de8 100644
--- a/srcpkgs/shiboken2/template
+++ b/srcpkgs/shiboken2/template
@@ -1,12 +1,12 @@
 # Template file for 'shiboken2'
 pkgname=shiboken2
 version=5.15.10
-revision=1
+revision=2
 _pkgname="pyside-setup-opensource-src-${version}"
 build_wrksrc="sources/shiboken2"
 build_style=cmake
 hostmakedepends="python3-devel python3-setuptools"
-makedepends="python3-devel qt5-devel qt5-xmlpatterns-devel clang libxml2-devel
+makedepends="python3-devel qt5-devel qt5-xmlpatterns-devel clang-devel libxml2-devel
  libxslt-devel python3-numpy"
 depends="clang"
 short_desc="Python binding generator of Qt5 C++ API"

From 6192061cd8980ea7a7006ffb3d9de8b021e9850b Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 Nov 2023 21:15:43 -0400
Subject: [PATCH 22/44] tilix: rebuild for llvm17

---
 srcpkgs/tilix/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/tilix/template b/srcpkgs/tilix/template
index 74ccb4dd4592d..90860da764ba7 100644
--- a/srcpkgs/tilix/template
+++ b/srcpkgs/tilix/template
@@ -1,7 +1,7 @@
 # Template file for 'tilix'
 pkgname=tilix
 version=1.9.4
-revision=7
+revision=9
 _undead_version=1.1.8
 build_wrksrc="${pkgname}-${version}"
 build_style=meson

From e1ca0b8ec5bef10e8a3dbae3294c3185b48b5cea Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Fri, 3 Nov 2023 22:04:24 -0400
Subject: [PATCH 23/44] zig: Build against old llvm15 packages

---
 srcpkgs/llvm15/template | 2 +-
 srcpkgs/zig/template    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/llvm15/template b/srcpkgs/llvm15/template
index bdd9b40ef82e7..1253f17cf1c4f 100644
--- a/srcpkgs/llvm15/template
+++ b/srcpkgs/llvm15/template
@@ -75,7 +75,7 @@ if [ "$_libomp_enable" = "yes" ]; then
 	_enabled_projects+=";openmp"
 	subpackages+=" libomp15 libomp15-devel"
 	# because of cmake nonsense referencing libomptarget.so.*
-	depends+=" libomp>=${version}_${revision}"
+	depends+=" libomp15>=${version}_${revision}"
 	if [ "$CROSS_BUILD" ]; then
 		# Seems to require a full host llvm/clang build
 		configure_args+=" -DLIBOMPTARGET_BUILD_CUDA_PLUGIN=OFF"
diff --git a/srcpkgs/zig/template b/srcpkgs/zig/template
index ca201c50131d3..52cda7e8e0cee 100644
--- a/srcpkgs/zig/template
+++ b/srcpkgs/zig/template
@@ -1,14 +1,14 @@
 # Template file for 'zig'
 pkgname=zig
 version=0.10.1
-revision=2
+revision=3
 archs="x86_64* aarch64*"
 build_style=cmake
 configure_args="-DZIG_TARGET_MCPU=baseline"
 make_cmd=make
 # we add xml2, zstd, zlib and ncurses
 # because our lld is static-only and requires those to work
-makedepends="clang llvm15 lld-devel libxml2-devel libzstd-devel ncurses-devel zlib-devel"
+makedepends="clang15 llvm15 lld15-devel libxml2-devel libzstd-devel ncurses-devel zlib-devel"
 short_desc="Programming language designed for robustness, optimality, and clarity"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"

From 9058734b18d355e6aa22d8427c9456cb663a02c6 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Sun, 3 Dec 2023 13:40:46 -0500
Subject: [PATCH 24/44] rust: Rebuild against llvm17

---
 srcpkgs/rust/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/rust/template b/srcpkgs/rust/template
index d33e713857ad3..d7f3f87e38f52 100644
--- a/srcpkgs/rust/template
+++ b/srcpkgs/rust/template
@@ -11,7 +11,7 @@ pkgname=rust
 version=1.75.0
 revision=2
 hostmakedepends="curl pkg-config python3 tar cargo-bootstrap"
-makedepends="libffi-devel ncurses-devel libxml2-devel zlib-devel llvm15"
+makedepends="libffi-devel ncurses-devel libxml2-devel zlib-devel llvm-devel"
 depends="rust-std gcc"
 short_desc="Safe, concurrent, practical systems language"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -34,7 +34,7 @@ if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 fi
 
 if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" rust llvm15"
+	hostmakedepends+=" rust llvm-devel"
 	# These are required for building the buildhost's stage0/1
 	hostmakedepends+=" libffi-devel libxml2-devel ncurses-devel zlib-devel"
 else

From 70c014f8091db4a091a8b69d438617cc1e10a3f0 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Tue, 9 Jan 2024 00:03:41 -0500
Subject: [PATCH 25/44] libclc: update to 17.0.6.

---
 srcpkgs/libclc/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/libclc/template b/srcpkgs/libclc/template
index 2fc397a56f2ca..6608262305784 100644
--- a/srcpkgs/libclc/template
+++ b/srcpkgs/libclc/template
@@ -1,19 +1,19 @@
 # Template file for 'libclc'
 pkgname=libclc
-version=15.0.7
+version=17.0.6
 revision=1
 build_style=cmake
 # disable clspv (failing tests, we don't ship it)
 configure_args="-DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
  -DLIBCLC_TARGETS_TO_BUILD=amdgcn--;amdgcn--amdhsa;r600--;nvptx--;nvptx64--;nvptx--nvidiacl;nvptx64--nvidiacl;spirv-mesa3d-;spirv64-mesa3d-"
-hostmakedepends="clang llvm python3 libedit-devel libffi-devel
+hostmakedepends="clang llvm-devel python3 libedit-devel libffi-devel
  ncurses-devel zlib-devel SPIRV-LLVM-Translator"
 short_desc="Open implementation of the OpenCL C programming language"
 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=35731fea7be224f21acf5bf3cd9f0ed058bf4ada5eceaf7f10ee96e139bd3389
+checksum=122f641d94d5dfbb3c37534f2b76612fa59d15c36c2a4917369a85eaaca32148
 replaces="libclc-git>=0"
 
 do_configure() {

From b62631b652d6761e910f26f95399bad7462d6980 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 10 Jan 2024 14:50:49 -0500
Subject: [PATCH 26/44] qtcreator: update to 12.0.1.

---
 srcpkgs/qtcreator/template | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/qtcreator/template b/srcpkgs/qtcreator/template
index c9ff18781412b..20c34b6b014c6 100644
--- a/srcpkgs/qtcreator/template
+++ b/srcpkgs/qtcreator/template
@@ -1,16 +1,16 @@
 # Template file for 'qtcreator'
 pkgname=qtcreator
-version=12.0.0
+version=12.0.1
 revision=1
 build_style=cmake
 configure_args="$(vopt_bool qbs BUILD_QBS) -DWITH_DOCS=ON -DBUILD_WITH_PCH=OFF"
-hostmakedepends="clang llvm perl pkg-config python3 which
+hostmakedepends="clang llvm-devel perl pkg-config python3 which
  qt6-base qt6-tools qtchooser qt6-shadertools qt6-declarative-host-tools"
 makedepends="qt6-declarative-devel
  qt6-quick3d-devel qt6-svg-devel qt6-plugin-odbc qt6-plugin-sqlite
  qt6-plugin-pgsql qt6-plugin-mysql qt6-qt5compat-devel
  qt6-serialport-devel
- clang llvm clang-tools-extra"
+ clang llvm-devel clang-tools-extra"
 depends="qt6-plugin-sqlite mesa-dri"
 short_desc="Cross-platform IDE for Qt developers"
 maintainer="Piotr Wójcik <chocimier@tlen.pl>"
@@ -18,7 +18,7 @@ license="LGPL-3.0-or-later, custom:QtCompany-GPL-Exception-1.0"
 homepage="https://wiki.qt.io/Category:Tools::QtCreator"
 changelog="https://code.qt.io/cgit/qt-creator/qt-creator.git/plain/dist/changelog/changes-${version}.md"
 distfiles="https://download.qt.io/official_releases/qtcreator/${version%.*}/${version}/qt-creator-opensource-src-${version}.tar.xz"
-checksum=399ae0dcefa3bd9e01a3f068b93dabe8b39f9b56466c389d1446e5c84c8f7b9f
+checksum=66fb92c2ced092829e3321c5a0911e2de98309d0310e7ab949a39a50238e03f3
 replaces="qtcreator-data>=0"
 python_version=3
 

From 168fc367a07ba2712220bf08be9a991f60aa500e Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 31 Jan 2024 18:56:50 -0500
Subject: [PATCH 27/44] btdu: Rebuild against llvm17

---
 srcpkgs/btdu/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/btdu/template b/srcpkgs/btdu/template
index a42917b4f665b..eb2a33360b3f6 100644
--- a/srcpkgs/btdu/template
+++ b/srcpkgs/btdu/template
@@ -1,7 +1,7 @@
 # Template file for 'btdu'
 pkgname=btdu
 version=0.5.1
-revision=1
+revision=2
 hostmakedepends="ldc dub"
 makedepends="zlib-devel ncurses-devel"
 short_desc="Sampling disk usage profiler for btrfs"

From c96d069f508e9bbae8b373426e14b520b2f007bb Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 31 Jan 2024 18:56:53 -0500
Subject: [PATCH 28/44] gtkd: Rebuild against llvm17

---
 srcpkgs/gtkd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gtkd/template b/srcpkgs/gtkd/template
index 6a75d69e19cec..da7d58bb5fb71 100644
--- a/srcpkgs/gtkd/template
+++ b/srcpkgs/gtkd/template
@@ -1,7 +1,7 @@
 # Template file for 'gtkd'
 pkgname=gtkd
 version=3.9.0
-revision=10
+revision=11
 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 1d15a07f38ff49be452e0bfa1dcd8ba93e88795a Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 31 Jan 2024 18:56:56 -0500
Subject: [PATCH 29/44] gtkd: Rebuild against llvm17

---
 srcpkgs/gtkd/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/gtkd/template b/srcpkgs/gtkd/template
index da7d58bb5fb71..5b2f55f857437 100644
--- a/srcpkgs/gtkd/template
+++ b/srcpkgs/gtkd/template
@@ -1,7 +1,7 @@
 # Template file for 'gtkd'
 pkgname=gtkd
 version=3.9.0
-revision=11
+revision=12
 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 ea48cf8df6bb78b969163e8eb34a8a067bfee167 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 31 Jan 2024 18:57:00 -0500
Subject: [PATCH 30/44] onedrive: Rebuild against llvm17

---
 srcpkgs/onedrive/template | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/srcpkgs/onedrive/template b/srcpkgs/onedrive/template
index 019a89325aace..ec226d7616b2e 100644
--- a/srcpkgs/onedrive/template
+++ b/srcpkgs/onedrive/template
@@ -1,7 +1,7 @@
 # Template file for 'onedrive'
 pkgname=onedrive
 version=2.4.25
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="DC=ldc2 --enable-notifications --enable-completions
  --with-bash-completion-dir=/usr/share/bash-completion/completions

From e8e8ce594997cd9933b8fddbb8967e080ebced4e Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 31 Jan 2024 20:04:18 -0500
Subject: [PATCH 31/44] qt5: Rebuild against llvm17

---
 srcpkgs/qt5/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/qt5/template b/srcpkgs/qt5/template
index ef6e437e02dbc..db638ce548541 100644
--- a/srcpkgs/qt5/template
+++ b/srcpkgs/qt5/template
@@ -5,9 +5,9 @@ pkgname=qt5
 version=5.15.11+20231124
 # commit 4765fa1df7a837db9c1f89c4da0dd76b74bb5fab
 # 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
+hostmakedepends="cmake clang llvm-devel flex perl glib-devel pkg-config
  python3 re2c ruby which"
 makedepends="SDL2-devel Vulkan-Headers alsa-lib-devel double-conversion-devel
  eudev-libudev-devel ffmpeg-devel freetds-devel glib-devel gst-plugins-base1-devel

From 1e71721dcb00e213240988c10aed0e0b5dfee34d Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 31 Jan 2024 22:40:31 -0500
Subject: [PATCH 32/44] afl++: Rebuild against llvm17

---
 srcpkgs/afl++/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/afl++/template b/srcpkgs/afl++/template
index fff658acbe1d7..a32eb3024c714 100644
--- a/srcpkgs/afl++/template
+++ b/srcpkgs/afl++/template
@@ -1,12 +1,12 @@
 # Template file for 'afl++'
 pkgname=afl++
 version=4.07c
-revision=2
+revision=3
 # x86 only currently
 archs="i686* x86_64*"
 build_style=gnu-makefile
 hostmakedepends="which"
-makedepends="clang gmp-devel lld llvm python3-devel"
+makedepends="clang gmp-devel lld llvm-devel python3-devel"
 short_desc="American fuzzy lop Plus Plus - a brute-force fuzzer"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"

From 543da90113373fd3650cb997c8ca0f9df2d41a7f Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 31 Jan 2024 22:40:34 -0500
Subject: [PATCH 33/44] bcc: Rebuild against llvm17

---
 srcpkgs/bcc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bcc/template b/srcpkgs/bcc/template
index 644eb378abe7c..87a6324099ce0 100644
--- a/srcpkgs/bcc/template
+++ b/srcpkgs/bcc/template
@@ -1,11 +1,11 @@
 # Template file for 'bcc'
 pkgname=bcc
 version=0.29.1
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DREVISION=${version} -DENABLE_LLVM_SHARED=1"
 hostmakedepends="flex python3-setuptools"
-makedepends="clang clang-tools-extra elfutils-devel flex lld-devel llvm
+makedepends="clang clang-tools-extra elfutils-devel flex lld-devel llvm-devel
  ncurses-devel python3-devel zlib-devel"
 short_desc="BPF-based Linux IO analysis, networking, monitoring, and more"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From cc4a357143fb0efa9d56a1c37ecbe0fb4eb8c2f5 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 31 Jan 2024 22:40:38 -0500
Subject: [PATCH 34/44] blender: Rebuild against llvm17

---
 srcpkgs/blender/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template
index 1dc61ec9d29d8..274f84b0a63c3 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,7 +1,7 @@
 # Template file for 'blender'
 pkgname=blender
 version=4.0.2
-revision=1
+revision=2
 archs="x86_64* ppc64*"
 build_style="cmake"
 pycompile_dirs="usr/share/blender/${version%.*}/scripts"
@@ -17,7 +17,7 @@ configure_args="-DWITH_INSTALL_PORTABLE=OFF -DWITH_PYTHON_INSTALL=OFF
 hostmakedepends="pkg-config"
 makedepends="libgomp-devel libpng-devel tiff-devel python3-devel glu-devel
  glew-devel freetype-devel jack-devel libopenal-devel libsndfile-devel
- libsamplerate-devel ffmpeg-devel fftw-devel boost-devel pcre-devel llvm
+ libsamplerate-devel ffmpeg-devel fftw-devel boost-devel pcre-devel llvm-devel
  libopenexr-devel libopenjpeg2-devel libXi-devel openimageio-devel
  opencolorio-devel opencollada-devel python3-numpy libXrender-devel
  OpenSubdiv-devel tbb-devel libxml2-devel openvdb-devel alembic-devel

From 8bfaf3d0a6774a29f99d0058784e178d8521d55a Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 31 Jan 2024 22:40:41 -0500
Subject: [PATCH 35/44] bpftrace: Rebuild against llvm17

---
 srcpkgs/bpftrace/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/bpftrace/template b/srcpkgs/bpftrace/template
index ff0808df4462c..10b91dfd52d2c 100644
--- a/srcpkgs/bpftrace/template
+++ b/srcpkgs/bpftrace/template
@@ -1,12 +1,12 @@
 # Template file for 'bpftrace'
 pkgname=bpftrace
 version=0.20.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
 hostmakedepends="flex pkg-config ruby-asciidoctor"
-makedepends="bcc-devel cereal clang clang-tools-extra elfutils-devel libbpf-devel libxml2-devel llvm"
+makedepends="bcc-devel cereal clang clang-tools-extra elfutils-devel libbpf-devel libxml2-devel llvm-devel"
 short_desc="High-level tracing language for Linux enhanced Berkeley Packet Filter"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
 license="Apache-2.0"

From d13c8ea2482a8db5ea6789c8737e664af27ee825 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 31 Jan 2024 22:40:45 -0500
Subject: [PATCH 36/44] ccls: Rebuild against llvm17

---
 srcpkgs/ccls/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ccls/template b/srcpkgs/ccls/template
index d0b21fa9cbb1d..866ac36d932f1 100644
--- a/srcpkgs/ccls/template
+++ b/srcpkgs/ccls/template
@@ -1,11 +1,11 @@
 # Template file for 'ccls'
 pkgname=ccls
 version=0.20230717
-revision=2
+revision=3
 build_style=cmake
 configure_args="-DUSE_SYSTEM_RAPIDJSON=ON"
 hostmakedepends="clang-tools-extra"
-makedepends="clang-tools-extra libxml2-devel llvm ncurses-devel rapidjson zlib-devel"
+makedepends="clang-tools-extra libxml2-devel llvm-devel ncurses-devel rapidjson zlib-devel"
 short_desc="C/C++/ObjC language server"
 maintainer="André Cerqueira <acerqueira021@gmail.com>"
 license="Apache-2.0"

From a61f3f5c9288b026baccb1d2b93a0bd2e2f35ad7 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 31 Jan 2024 22:40:48 -0500
Subject: [PATCH 37/44] firefox-esr: Rebuild against llvm17

---
 srcpkgs/firefox-esr/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/firefox-esr/template b/srcpkgs/firefox-esr/template
index baa8e8455f224..07e82d3196511 100644
--- a/srcpkgs/firefox-esr/template
+++ b/srcpkgs/firefox-esr/template
@@ -5,7 +5,7 @@
 #
 pkgname=firefox-esr
 version=115.0.2
-revision=2
+revision=3
 build_helper="rust"
 short_desc="Mozilla Firefox web browser - Extended Support Release"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -17,7 +17,7 @@ checksum=45723c83ea7dc318ec50d67eebf834163b626ec3924a3131fecddfc7268a95f5
 lib32disabled=yes
 
 hostmakedepends="autoconf213 unzip zip pkg-config perl python3 yasm rust cargo
- llvm clang lld nodejs cbindgen nasm which tar"
+ llvm-devel clang lld nodejs cbindgen nasm which tar"
 makedepends="nss-devel libjpeg-turbo-devel gtk+3-devel icu-devel
  pixman-devel libevent-devel libnotify-devel libvpx-devel libwebp-devel
  libXrender-devel libXcomposite-devel libSM-devel libXt-devel rust-std

From e44ea9b4f8fcb50e2be04abb886771e99dbf93b9 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 31 Jan 2024 22:40:52 -0500
Subject: [PATCH 38/44] firefox: Rebuild against llvm17

---
 srcpkgs/firefox/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/firefox/template b/srcpkgs/firefox/template
index 0cca0ac17ab3f..8c87dcf9ef777 100644
--- a/srcpkgs/firefox/template
+++ b/srcpkgs/firefox/template
@@ -4,7 +4,7 @@
 #
 pkgname=firefox
 version=122.0
-revision=1
+revision=2
 build_helper="rust"
 short_desc="Mozilla Firefox web browser"
 maintainer="Duncaen <duncaen@voidlinux.org>"
@@ -16,7 +16,7 @@ checksum=b84815a90e147965e4c0b50599c85b1022ab0fce42105e5ef45c630dcca5dec3
 lib32disabled=yes
 
 hostmakedepends="autoconf213 unzip zip pkg-config perl python3.11 yasm rust
- cargo llvm clang lld nodejs cbindgen nasm which tar"
+ cargo llvm-devel clang lld nodejs cbindgen nasm which tar"
 makedepends="nss-devel libjpeg-turbo-devel gtk+3-devel icu-devel
  pixman-devel libevent-devel libnotify-devel libvpx-devel libwebp-devel
  libXrender-devel libXcomposite-devel libSM-devel libXt-devel rust-std

From c01b68418c7289c1f0438182548a035a74137314 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 31 Jan 2024 22:40:55 -0500
Subject: [PATCH 39/44] ispc: Rebuild against llvm17

---
 srcpkgs/ispc/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/ispc/template b/srcpkgs/ispc/template
index aab387ad2c41d..89783ec09f747 100644
--- a/srcpkgs/ispc/template
+++ b/srcpkgs/ispc/template
@@ -1,11 +1,11 @@
 # Template file for 'ispc'
 pkgname=ispc
 version=1.22.0
-revision=1
+revision=2
 archs="aarch64* x86_64*"
 build_style=cmake
 configure_args="-DISPC_INCLUDE_EXAMPLES=OFF -DISPC_INCLUDE_RT=OFF"
-hostmakedepends="clang clang-tools-extra python3 m4 bison flex llvm"
+hostmakedepends="clang clang-tools-extra python3 m4 bison flex llvm-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>"

From c75b1659bcd15821e358bfe00f7a51a124e5c845 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 31 Jan 2024 22:40:59 -0500
Subject: [PATCH 40/44] juCi++: Rebuild against llvm17

---
 srcpkgs/juCi++/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/juCi++/template b/srcpkgs/juCi++/template
index 4b40d142462dc..458d95891cc22 100644
--- a/srcpkgs/juCi++/template
+++ b/srcpkgs/juCi++/template
@@ -1,13 +1,13 @@
 # Template file for 'juCi++'
 pkgname=juCi++
 version=1.7.2
-revision=7
+revision=8
 _libclangmm_commit="9704b9b6de0982a588fa41741157d5640afedf30"
 _tiny_commit="839ff806dc447ff49af80f9a9eaa7949f770f8e5"
 create_wrksrc=yes
 build_style=cmake
 hostmakedepends="pkg-config"
-makedepends="aspell-devel clang boost-devel gtksourceviewmm-devel libgit2-devel"
+makedepends="aspell-devel clang-devel boost-devel gtksourceviewmm-devel libgit2-devel"
 depends="ctags"
 short_desc="Lightweight IDE supporting the most recent C++ standards"
 maintainer="rc-05 <rc23@email.it>"

From 8d47cf1b8c1c9bd0b4f21db6b882465225017c36 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 31 Jan 2024 22:41:02 -0500
Subject: [PATCH 41/44] openpgp-ca: Rebuild against llvm17

---
 srcpkgs/openpgp-ca/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/openpgp-ca/template b/srcpkgs/openpgp-ca/template
index 9f26ac5769fc0..3339e9890feab 100644
--- a/srcpkgs/openpgp-ca/template
+++ b/srcpkgs/openpgp-ca/template
@@ -1,10 +1,10 @@
 # Template file for 'openpgp-ca'
 pkgname=openpgp-ca
 version=0.13.0
-revision=1
+revision=2
 build_style=cargo
 make_install_args="--path openpgp-ca-bin"
-hostmakedepends="pkg-config clang llvm nettle-devel sqlite-devel"
+hostmakedepends="pkg-config clang llvm-devel nettle-devel sqlite-devel"
 makedepends="openssl-devel nettle-devel clang sqlite-devel pcsclite-devel"
 depends="gnupg"
 short_desc="Tool for handling OpenPGP keys in organizaations"

From aa156a5c11cd27ffe43eaa12dcafa26b9513a598 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 31 Jan 2024 22:41:06 -0500
Subject: [PATCH 42/44] openpgp-card-tools: Rebuild against llvm17

---
 srcpkgs/openpgp-card-tools/template | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/openpgp-card-tools/template b/srcpkgs/openpgp-card-tools/template
index 23e3730701db3..c312716349d80 100644
--- a/srcpkgs/openpgp-card-tools/template
+++ b/srcpkgs/openpgp-card-tools/template
@@ -1,9 +1,9 @@
 # Template file for 'openpgp-card-tools'
 pkgname=openpgp-card-tools
 version=0.9.5
-revision=1
+revision=2
 build_style=cargo
-hostmakedepends="pkg-config llvm clang"
+hostmakedepends="pkg-config llvm-devel clang"
 makedepends="nettle-devel pcsclite-devel"
 depends="pcsclite pcsc-ccid"
 short_desc="Tools for inspecting, configuring and using OpenPGP cards"
@@ -11,7 +11,7 @@ maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"
 license="MIT, Apache-2.0"
 homepage="https://codeberg.org/openpgp-card/openpgp-card-tools"
 distfiles="https://codeberg.org/openpgp-card/openpgp-card-tools/archive/v${version}.tar.gz"
-checksum=11f4900d76ee65b8434c6feccf78aa7c3a09454dc8e46aca10c708cedadffc38
+checksum=72c0595834495d7a2003670937108d1c520ae1d5a3e79f2a929af4249d847266
 
 post_install() {
 	vlicense "LICENSES/MIT.txt"

From 0b8d8cd5e76c92c28c09c71e6193b8f564573a2e Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 31 Jan 2024 22:41:09 -0500
Subject: [PATCH 43/44] sequoia-sop: Rebuild against llvm17

---
 srcpkgs/sequoia-sop/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sequoia-sop/template b/srcpkgs/sequoia-sop/template
index afcf0ace397dc..7e67f2bba7fd5 100644
--- a/srcpkgs/sequoia-sop/template
+++ b/srcpkgs/sequoia-sop/template
@@ -1,10 +1,10 @@
 # Template file for 'sequoia-sop'
 pkgname=sequoia-sop
 version=0.31.0
-revision=1
+revision=2
 build_style=cargo
 configure_args="--bin sqop --features cli"
-hostmakedepends="pkg-config llvm clang"
+hostmakedepends="pkg-config llvm-devel clang"
 makedepends="nettle-devel"
 short_desc="Implementation of the Stateless OpenPGP CLI using Sequoia"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"

From 804a6c8182c6edc938fbf801e99aaa9b8faef6c6 Mon Sep 17 00:00:00 2001
From: Daniel Martinez <danielmartinez@cock.li>
Date: Wed, 31 Jan 2024 22:41:13 -0500
Subject: [PATCH 44/44] sequoia-sq: Rebuild against llvm17

---
 srcpkgs/sequoia-sq/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/sequoia-sq/template b/srcpkgs/sequoia-sq/template
index 8c1f896cbd1a3..afcbea287a1dc 100644
--- a/srcpkgs/sequoia-sq/template
+++ b/srcpkgs/sequoia-sq/template
@@ -1,11 +1,11 @@
 # Template file for 'sequoia-sq'
 pkgname=sequoia-sq
 version=0.32.0
-revision=1
+revision=2
 build_style=cargo
 build_helper=qemu
 _deps="nettle-devel openssl-devel sqlite-devel"
-hostmakedepends="pkg-config llvm clang ${_deps}"
+hostmakedepends="pkg-config llvm-devel clang ${_deps}"
 makedepends="${_deps}"
 short_desc="Command-line frontend for Sequoia, a new OpenPGP implementation"
 maintainer="Jan Christian Grünhage <jan.christian@gruenhage.xyz>"

  parent reply	other threads:[~2024-02-01  3:41 UTC|newest]

Thread overview: 120+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-10-28  1:03 [PR PATCH] WIP: " Calandracas606
2023-10-28  1:20 ` [PR PATCH] [Updated] " Calandracas606
2023-10-28  1:29 ` [PR REVIEW] " Calandracas606
2023-10-28  1:29 ` Calandracas606
2023-10-28  1:29 ` Calandracas606
2023-10-28  1:29 ` Calandracas606
2023-10-28  1:29 ` Calandracas606
2023-10-28  1:29 ` Calandracas606
2023-10-28 17:34 ` [WIP] " Calandracas606
2023-10-28 22:20 ` [PR REVIEW] " mhmdanas
2023-10-29 14:50 ` sh1r4s3
2023-10-29 14:53 ` sh1r4s3
2023-10-29 14:56 ` [PR PATCH] [Updated] " Calandracas606
2023-10-29 14:57 ` [PR REVIEW] " Calandracas606
2023-10-29 15:00 ` Calandracas606
2023-10-29 15:05 ` Calandracas606
2023-10-29 17:47 ` Calandracas606
2023-10-31  3:33 ` [PR PATCH] [Updated] " Calandracas606
2023-10-31 14:48 ` Calandracas606
2023-10-31 14:49 ` Calandracas606
2023-10-31 14:50 ` [PR PATCH] [Updated] " Calandracas606
2023-10-31 14:52 ` [PR REVIEW] " Calandracas606
2023-10-31 14:52 ` Calandracas606
2023-10-31 19:17 ` [PR PATCH] [Updated] " Calandracas606
2023-10-31 20:09 ` [PR REVIEW] " Calandracas606
2023-10-31 20:09 ` Calandracas606
2023-10-31 20:09 ` Calandracas606
2023-11-02 15:37 ` [PR PATCH] [Updated] " Calandracas606
2023-11-03  2:53 ` Calandracas606
2023-11-03  2:59 ` [PR REVIEW] " Calandracas606
2023-11-03  3:14 ` [PR PATCH] [Updated] " Calandracas606
2023-11-03  3:18 ` Calandracas606
2023-11-03 13:03 ` Calandracas606
2023-11-03 15:11 ` Calandracas606
2023-11-03 19:18 ` [PR REVIEW] " Calandracas606
2023-11-03 19:18 ` Calandracas606
2023-11-03 20:48 ` [PR PATCH] [Updated] " Calandracas606
2023-11-03 21:49 ` Calandracas606
2023-11-03 22:51 ` Calandracas606
2023-11-04  2:04 ` Calandracas606
2023-11-04  2:20 ` [PR REVIEW] " Calandracas606
2023-11-04  2:23 ` Calandracas606
2023-11-05  2:47 ` Calandracas606
2023-11-05 15:49 ` Calandracas606
2023-11-07 18:33 ` [PR PATCH] [Updated] " Calandracas606
2023-11-07 18:37 ` [PR REVIEW] " Calandracas606
2023-11-07 20:45 ` [PR PATCH] [Updated] " Calandracas606
2023-11-16 13:34 ` [PR REVIEW] " ahesford
2023-11-16 16:33 ` Calandracas606
2023-11-16 20:52 ` tranzystorekk
2023-12-02 23:43 ` [PR PATCH] [Updated] " Calandracas606
2023-12-03  1:49 ` sbromberger
2023-12-03 13:36 ` sbromberger
2023-12-03 13:37 ` sbromberger
2023-12-03 18:45 ` [PR PATCH] [Updated] " Calandracas606
2023-12-06  3:38 ` Calandracas606
2023-12-06 18:38 ` Calandracas606
2023-12-07  0:48 ` Calandracas606
2023-12-08  4:12 ` Calandracas606
2023-12-12 17:29 ` Calandracas606
2023-12-16 19:01 ` Calandracas606
2023-12-16 19:39 ` Calandracas606
2023-12-17  0:29 ` Calandracas606
2023-12-26 16:34 ` Calandracas606
2023-12-31  3:58 ` Calandracas606
2024-01-03 21:22 ` Calandracas606
2024-01-03 21:24 ` Calandracas606
2024-01-08 13:37 ` [PR PATCH] [Updated] " Calandracas606
2024-01-09  5:08 ` Calandracas606
2024-01-09  5:14 ` sbromberger
2024-01-09  5:59 ` Calandracas606
2024-01-09  6:00 ` Calandracas606
2024-01-10  3:31 ` [PR PATCH] [Updated] " Calandracas606
2024-01-10 19:51 ` Calandracas606
2024-01-11 12:27 ` Luciogi
2024-01-11 12:39 ` [PR PATCH] [Updated] " Calandracas606
2024-01-11 12:40 ` Calandracas606
2024-01-11 13:02 ` Calandracas606
2024-01-12 13:07 ` Luciogi
2024-01-12 13:07 ` Luciogi
2024-01-12 13:23 ` Calandracas606
2024-01-16 19:43 ` [PR REVIEW] " Calandracas606
2024-01-17 16:30 ` Luciogi
2024-01-17 16:30 ` Luciogi
2024-01-17 17:09 ` Calandracas606
2024-01-26  0:03 ` [PR PATCH] [Updated] " Calandracas606
2024-01-26  0:06 ` Calandracas606
2024-01-30 13:23 ` [PR PATCH] [Updated] " Calandracas606
2024-01-30 13:26 ` Calandracas606
2024-01-30 22:17 ` Calandracas606
2024-01-30 22:18 ` Calandracas606
2024-01-31  2:35 ` [PR PATCH] [Updated] " Calandracas606
2024-01-31  3:01 ` Calandracas606
2024-01-31  4:50 ` [PR PATCH] [Updated] " Calandracas606
2024-01-31 17:38 ` Calandracas606
2024-01-31 20:58 ` Calandracas606
2024-01-31 21:42 ` Calandracas606
2024-02-01  3:41 ` Calandracas606 [this message]
2024-02-01  4:01 ` Calandracas606
2024-02-01 17:39 ` [PR PATCH] [Updated] " Calandracas606
2024-02-01 17:49 ` Calandracas606
2024-02-01 20:43 ` Calandracas606
2024-02-01 20:58 ` Calandracas606
2024-02-01 22:52 ` [PR PATCH] [Updated] " Calandracas606
2024-02-01 23:03 ` Calandracas606
2024-02-02  4:14 ` Calandracas606
2024-02-02  4:15 ` Calandracas606
2024-02-02  5:00 ` [PR PATCH] [Updated] " Calandracas606
2024-02-03 19:42 ` Calandracas606
2024-02-03 19:45 ` Calandracas606
2024-02-05 23:33 ` Calandracas606
2024-02-07 15:38 ` Calandracas606
2024-02-07 23:54 ` Calandracas606
2024-02-08  0:02 ` Calandracas606
2024-02-08  0:05 ` Calandracas606
2024-02-08  0:17 ` Calandracas606
2024-02-08 21:40 ` dkwo
2024-02-08 21:47 ` dkwo
2024-02-12  3:49 ` Calandracas606
2024-02-12 13:13 ` [PR PATCH] [Closed]: " leahneukirchen

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=20240201034153.3E26622229@inbox.vuxu.org \
    --to=calandracas606@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).