Package: release.debian.org
Severity: normal
Tags: trixie
User: [email protected]
Usertags: pu
X-Debbugs-Cc: [email protected], [email protected]

[ Reason ]
Clang 19 is getting a little long in the tooth for chromium. In addition, we're going to need newer version of rustc-web for both chromium and upcoming firefox-esr 153; but newer versions of rustc require at least llvm-toolchain-20.

Note that 22.1.6-1 is currently in testing, but 22.1.7-1 is about to migrate. If for some reason 22.1.7-1 fails to migrate in a timely manner, I can fall back to 22.1.6-1.

[ Impact ]
Minimal, as this only impacts packages which intentionally choose to build against llvm-toolchain-22.

Note that this version of llvm-toolchain-$VERSION (unlike past versions) builds libc++1, libc++abi1, and llvm-libunwind1 packages *without* the major version in the package name. This could cause problems in future backports of llvm-toolchain-$VERSION, but won't be a problem for trixie since it was released with an older version of llvm-toolchain-19 that included libc++1-19 (and friends).

[ Tests ]
Chromium 149.0.7827.53-1~deb13u1 succeeded in building using clang-22 22.1.7-1~deb13u1 packages, and I'm currently using those chromium packages for browsing.

[ Risks ]
Low risk for the above stated reasons.

[ Checklist ]
  [x] *all* changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in stable
  [x] the issue is verified as fixed in unstable

[ Changes ]
Since llvm-toolchain-22 isn't currently in trixie, I've included the diff between what's in 22.1.7-1 (in sid) and what's changed in 22.1.7-1~deb13u1. The g++-multilib change happens automatically as d/control gets regenerated from d/control.in and s390x gets filtered out of MULTIARCH_LIBS; I'm merely documenting it in d/changelog.
diff -urN a/llvm-toolchain-22-22.1.7/debian/changelog b/llvm-toolchain-22-22.1.7/debian/changelog
--- a/llvm-toolchain-22-22.1.7/debian/changelog	2026-06-02 07:17:45.000000000 +0000
+++ b/llvm-toolchain-22-22.1.7/debian/changelog	2026-06-09 07:02:32.248944772 +0000
@@ -1,3 +1,12 @@
+llvm-toolchain-22 (1:22.1.7-1~deb13u1) trixie; urgency=medium
+
+  * Non-maintainer upload.
+  * Rebuild for trixie.
+  * Change build-dep from sid's llvm-spirv-22 to trixie's llvm-spirv-19.
+  * Drop s390x from g++-multilib build-dep.
+
+ -- Andres Salomon <[email protected]>  Mon, 08 Jun 2026 05:40:00 +0000
+
 llvm-toolchain-22 (1:22.1.7-1) unstable; urgency=medium
 
   * experimental New snapshot release
diff -urN a/llvm-toolchain-22-22.1.7/debian/control b/llvm-toolchain-22-22.1.7/debian/control
--- a/llvm-toolchain-22-22.1.7/debian/control	2026-05-06 07:45:48.000000000 +0000
+++ b/llvm-toolchain-22-22.1.7/debian/control	2026-06-09 06:58:59.515932052 +0000
@@ -15,7 +15,7 @@
     libipt-dev [amd64 i386],
     lcov, procps, help2man,
     zlib1g-dev, libzstd-dev,
-    g++-multilib [amd64 i386 mips64 mips64el mipsel powerpc ppc64 sparc sparc64 x32] | hello [amd64 i386 mips64 mips64el mipsel powerpc ppc64 sparc sparc64 x32],
+    g++-multilib [amd64 i386 mips64 mips64el mipsel powerpc ppc64 s390x sparc sparc64 x32] | hello [amd64 i386 mips64 mips64el mipsel powerpc ppc64 s390x sparc sparc64 x32],
     libjs-mathjax, python3-myst-parser | python3-recommonmark, python3-pexpect,
     doxygen, time,
     dh-exec, dh-python, ocaml-base [amd64 arm64 ppc64el riscv64 s390x] <!pkg.llvm.noocaml> | ocaml-nox [amd64 arm64 ppc64el riscv64 s390x] <!pkg.llvm.noocaml>, ocaml-findlib [amd64 arm64 ppc64el riscv64 s390x] <!pkg.llvm.noocaml>, libctypes-ocaml-dev [amd64 arm64 ppc64el riscv64 s390x] <!pkg.llvm.noocaml>, dh-ocaml [amd64 arm64 ppc64el riscv64 s390x] <!pkg.llvm.noocaml>,
@@ -23,7 +23,7 @@
 # "| hello" is for older buster/bionic distros without spirv support
 # We need to keep the constraints coherent between the two alternatives, otherwise
 # hello would get installed unexpectedly and prevent e.g. wasi-libc from getting pulled
-    llvm-spirv-22 [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] <!stage1> | hello [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] <!stage1>,
+    llvm-spirv-19 [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] <!stage1> | hello [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] <!stage1>,
     spirv-tools [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] <!stage1> | hello [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] <!stage1>,
     wasi-libc | hello,
     mingw-w64-common,
diff -urN a/llvm-toolchain-22-22.1.7/debian/control.in b/llvm-toolchain-22-22.1.7/debian/control.in
--- a/llvm-toolchain-22-22.1.7/debian/control.in	2026-05-06 07:14:26.000000000 +0000
+++ b/llvm-toolchain-22-22.1.7/debian/control.in	2026-06-08 05:43:29.589933840 +0000
@@ -23,7 +23,7 @@
 # "| hello" is for older buster/bionic distros without spirv support
 # We need to keep the constraints coherent between the two alternatives, otherwise
 # hello would get installed unexpectedly and prevent e.g. wasi-libc from getting pulled
-    llvm-spirv-22 [@LLVM_SPIRV_ARCHS@] <!stage1>@BEGIN_OPTIONAL_HELLO@ | hello [@LLVM_SPIRV_ARCHS@] <!stage1>@END_OPTIONAL_HELLO@,
+    llvm-spirv-19 [@LLVM_SPIRV_ARCHS@] <!stage1>@BEGIN_OPTIONAL_HELLO@ | hello [@LLVM_SPIRV_ARCHS@] <!stage1>@END_OPTIONAL_HELLO@,
     spirv-tools [@LLVM_SPIRV_ARCHS@] <!stage1>@BEGIN_OPTIONAL_HELLO@ | hello [@LLVM_SPIRV_ARCHS@] <!stage1>@END_OPTIONAL_HELLO@,
     wasi-libc@BEGIN_OPTIONAL_HELLO@ | hello@END_OPTIONAL_HELLO@,
     mingw-w64-common,

Reply via email to