On Sat, Oct 14 2023 at 12:01:05 PM +01:00:00, Adam D. Barratt
<a...@adam-barratt.org.uk> wrote:
On Sat, 2023-10-14 at 00:54 -0400, Andres Salomon wrote:
I built deb11u2 with the following changes from 16.0.6-15. Chromium
successfully builds against it. Let me know if you want me to file a
separate release.d.o bug for it, or just upload it, or what.
[...]
--- a/llvm-toolchain-16-16.0.6/debian/control 2023-09-10
06:14:34.000000000 +0000
+++ b/llvm-toolchain-16-16.0.6/debian/control 2023-10-13
16:24:09.000000000 +0000
@@ -23,7 +23,7 @@
libctypes-ocaml-dev [amd64 arm64 armhf ppc64el riscv64 s390x],
dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el riscv64 s390x],
libpfm4-dev [linux-any], python3-setuptools, libz3-dev,
- llvm-spirv-16 [ amd64 arm64 armel armhf i386 mips64el ppc64el
riscv64 s390x ] <!stage1> | hello [!i386],
+ llvm-spirv [ amd64 arm64 armel armhf i386 mips64el ppc64el
riscv64
s390x ] <!stage1> | hello [!i386],
Please go ahead (as a source-only upload).
Thanks, uploaded.
fwiw, for bookworm it looks like we'll need to use either
llvm-spirv-14
or llvm-spirv-15.
I'll get started on the bookworm llvm stuff once chromium's
uploaded/built for bullseye-security.
BTW, the bullseye llvm package went and reverted d/control when I
rebuilt it, so I had to change d/control.in as well. The actual diff
for what I uploaded:
diff -urN a/llvm-toolchain-16-16.0.6/debian/changelog
b/llvm-toolchain-16-16.0.6/debian/changelog
--- a/llvm-toolchain-16-16.0.6/debian/changelog 2023-09-11
13:40:42.000000000 +0000
+++ b/llvm-toolchain-16-16.0.6/debian/changelog 2023-10-13
16:25:00.000000000 +0000
@@ -1,3 +1,16 @@
+llvm-toolchain-16 (1:16.0.6-15~deb11u2) bullseye; urgency=medium
+
+ * Build-dep on llvm-spirv instead of llvm-spirv-16 to make sbuild
happy.
+
+ -- Andres Salomon <dilin...@debian.org> Fri, 13 Oct 2023 16:25:00
+0000
+
+llvm-toolchain-16 (1:16.0.6-15~deb11u1) bullseye; urgency=medium
+
+ * Non-maintainer upload.
+ * Rebuild for bullseye.
+
+ -- Andres Salomon <dilin...@debian.org> Tue, 10 Oct 2023 05:55:47
+0000
+
llvm-toolchain-16 (1:16.0.6-15) unstable; urgency=medium
* Second attempt to refresh D158066.patch (Closes: #1049362)
diff -urN a/llvm-toolchain-16-16.0.6/debian/control
b/llvm-toolchain-16-16.0.6/debian/control
--- a/llvm-toolchain-16-16.0.6/debian/control 2023-09-10
06:14:34.000000000 +0000
+++ b/llvm-toolchain-16-16.0.6/debian/control 2023-10-13
16:25:00.000000000 +0000
@@ -23,7 +23,7 @@
libctypes-ocaml-dev [amd64 arm64 armhf ppc64el riscv64 s390x],
dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el riscv64 s390x],
libpfm4-dev [linux-any], python3-setuptools, libz3-dev,
- llvm-spirv-16 [ amd64 arm64 armel armhf i386 mips64el ppc64el
riscv64 s390x ] <!stage1> | hello [!i386],
+ llvm-spirv [ amd64 arm64 armel armhf i386 mips64el ppc64el riscv64
s390x ] <!stage1> | hello [!i386],
spirv-tools [ linux-any ] | hello [ !i386],
wasi-libc | hello [ !any-i386],
libcurl4-openssl-dev | libcurl-dev,
diff -urN a/llvm-toolchain-16-16.0.6/debian/control.in
b/llvm-toolchain-16-16.0.6/debian/control.in
--- a/llvm-toolchain-16-16.0.6/debian/control.in 2023-09-10
06:14:36.000000000 +0000
+++ b/llvm-toolchain-16-16.0.6/debian/control.in 2023-10-13
16:25:00.000000000 +0000
@@ -23,7 +23,7 @@
libctypes-ocaml-dev [amd64 arm64 armhf ppc64el riscv64 s390x],
dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el riscv64 s390x],
libpfm4-dev [linux-any], python3-setuptools, libz3-dev,
- llvm-spirv-16 [ amd64 arm64 armel armhf i386 mips64el ppc64el
riscv64 s390x ] <!stage1> | hello [!i386],
+ llvm-spirv [ amd64 arm64 armel armhf i386 mips64el ppc64el riscv64
s390x ] <!stage1> | hello [!i386],
spirv-tools [ linux-any ] | hello [ !i386],
wasi-libc | hello [ !any-i386],
libcurl4-openssl-dev | libcurl-dev,
