Bug#1139451: llvm-toolchain-22 22.1.8-1~deb13u3 flagged for acceptance
Andres Salomon <[email protected]>
| Newsgroups | gmane.linux.debian.devel.release |
|---|---|
| Message-ID | <a412d7fe-bf78-4ef3-a142-0db3aa5de8a3__44530.2455731266$1786843170$gmane$org@queued.net> |
Hi, The deb13u3 package failed to build on a bunch of architectures on trixie: https://buildd.debian.org/status/package.php?p=llvm-toolchain-22&suite=trixie The ppc64el build failure is an upstream bug that's fixed in newer versions of LLVM, but for 22 we can just work around it (which Emilio did successfully for his deb12u1 upload https://people.debian.org/~pochu/llvm-bookworm.debdiff ). The i386 invalid build-dep is related to libomp not being built on trixie (though it was later added to 19 after trixie's release). Emilio also fixed that in his bookworm upload. The remaining two architectures (armel, s390x) not getting built are because of a bug in d/rules; when I switched from using llvm-libunwind1 to libunwind-19, I missed the spot where the list of architectures for that package is generated for the build-dep. I've prepared deb13u4 to fix all of those build failures. I've attached a debdiff between deb13u3 and deb13u4. If it looks good, I'll do a source-only upload to trixie. (Emilio, you'll probably want to pull that libunwind fix into bookworm and possibly bullseye's llvm-toolchain-22.) Thanks, Andres On 8/9/26 10:58, Adam D Barratt wrote: > package release.debian.org > tags 1139451 = trixie pending > thanks > > Hi, > > The upload referenced by this bug report has been flagged for acceptance into the proposed-updates queue for Debian trixie. > > Thanks for your contribution! > > Upload details > ============== > > Package: llvm-toolchain-22 > Version: 22.1.8-1~deb13u3 > > Explanation: new package to support chromium builds
llvm-22-6.patch
(text/x-patch, 4.4 KB)
diff -urN a/debian/changelog b/debian/changelog --- a/debian/changelog 2026-08-15 23:53:29.742924812 +0000 +++ b/debian/changelog 2026-08-16 00:53:05.478130037 +0000 @@ -1,3 +1,15 @@ +llvm-toolchain-22 (1:22.1.8-1~deb13u4) trixie; urgency=medium + + * d/rules: + - Disable OMP on i386, trixie's llvm-toolchain-19 doesn't have it. + - Disable LIBUNWIND on s390x, trixie's llvm-toolchain-19 doesn't have it. + - Disable OFFLOAD on ppc64el, it FTBFS. + - Fix architecture list generation for libunwind build-dep (which was + broken due to matching against llvm-libunwind1 instead of + libunwind-19). + + -- Andres Salomon <[email protected]> Sat, 15 Aug 2026 23:55:12 +0000 + llvm-toolchain-22 (1:22.1.8-1~deb13u3) trixie; urgency=medium * d/patches/x86-fix-incorrect-load-combining-causing-oob-reads.patch: diff -urN a/debian/control b/debian/control --- a/debian/control 2026-08-15 23:53:29.746924815 +0000 +++ b/debian/control 2026-08-16 00:51:07.457943950 +0000 @@ -8,7 +8,7 @@ chrpath, texinfo, sharutils, libelf-dev, libffi-dev, - lsb-release, patchutils, diffstat, xz-utils, python3-dev, libc++1-19, libc++abi1-19, libomp5-19 [amd64 arm64 armhf i386 loong64 mips64el ppc64 ppc64el riscv64 hurd-amd64], libunwind-19, libllvm19, + lsb-release, patchutils, diffstat, xz-utils, python3-dev, libc++1-19, libc++abi1-19, libomp5-19 [amd64 arm64 armhf loong64 mips64el ppc64 ppc64el riscv64 hurd-amd64], libunwind-19 [amd64 arm64 armhf i386 loong64 ppc64 ppc64el riscv64], libllvm19, libedit-dev, libncurses-dev, swig, python3-sphinx (>= 1.3.6), binutils-dev, lld [amd64 arm64 armel armhf i386 loong64 ppc64el riscv64 s390x] | hello [amd64 arm64 armel armhf i386 loong64 ppc64el riscv64 s390x], libxml2-dev, @@ -649,7 +649,7 @@ Package: libomp-22-dev Build-Profiles: <!pkg.llvm.noclang> Section: libdevel -Architecture: amd64 arm64 armhf i386 loong64 mips64el ppc64 ppc64el riscv64 hurd-amd64 +Architecture: amd64 arm64 armhf loong64 mips64el ppc64 ppc64el riscv64 hurd-amd64 Depends: libomp5-19, ${shlibs:Depends}, ${misc:Depends} Suggests: libomp-22-doc Breaks: libomp-dev (<< 3.7-1), libomp5 (<< 1:22~++20251023025710+3f47a7be1ae6-1~exp4) @@ -684,7 +684,7 @@ Package: liboffload-22-dev Build-Profiles: <!pkg.llvm.noclang> Section: libdevel -Architecture: amd64 arm64 loong64 ppc64el riscv64 +Architecture: amd64 arm64 loong64 riscv64 Depends: liboffload-22 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} Provides: liboffload-x.y-dev Breaks: libomp5 (<< 1:22~++20251023025710+3f47a7be1ae6-1~exp3) @@ -700,7 +700,7 @@ Package: liboffload-22 Build-Profiles: <!pkg.llvm.noclang> -Architecture: amd64 arm64 loong64 ppc64el riscv64 +Architecture: amd64 arm64 loong64 riscv64 Depends: ${shlibs:Depends}, ${misc:Depends} Provides: liboffload-x.y Conflicts: liboffload-x.y @@ -847,7 +847,7 @@ Package: libunwind-22-dev Build-Profiles: <!pkg.llvm.noclang> Section: libdevel -Architecture: amd64 arm64 armhf i386 loong64 ppc64 ppc64el riscv64 s390x +Architecture: amd64 arm64 armhf i386 loong64 ppc64 ppc64el riscv64 Depends: ${misc:Depends}, libunwind-19 diff -urN a/debian/rules b/debian/rules --- a/debian/rules 2026-08-15 23:53:29.750924818 +0000 +++ b/debian/rules 2026-08-16 00:49:48.985810097 +0000 @@ -688,7 +688,7 @@ endif # Enable libunwind (or not) -LIBUNWIND_ARCHS := amd64 arm64 armhf i386 loong64 ppc64 ppc64el riscv64 s390x +LIBUNWIND_ARCHS := amd64 arm64 armhf i386 loong64 ppc64 ppc64el riscv64 LIBUNWIND_ENABLE=yes ifeq (,$(filter $(DEB_HOST_ARCH), $(LIBUNWIND_ARCHS))) LIBUNWIND_ENABLE=no @@ -700,11 +700,11 @@ RUNTIMES += ;libunwind endif ifeq ($(SKIP_COMMON_PACKAGES),yes) - COMMON_BUILD_DEPS := $(subst llvm-libunwind1,llvm-libunwind1 [$(LIBUNWIND_ARCHS)],$(COMMON_BUILD_DEPS)) + COMMON_BUILD_DEPS := $(subst libunwind-$(NEW_LLVM_VERSION),libunwind-$(NEW_LLVM_VERSION) [$(LIBUNWIND_ARCHS)],$(COMMON_BUILD_DEPS)) endif # Enable openmp (or not) -OMP_ARCHS = amd64 arm64 armhf i386 loong64 mips64el ppc64 ppc64el riscv64 hurd-amd64 +OMP_ARCHS = amd64 arm64 armhf loong64 mips64el ppc64 ppc64el riscv64 hurd-amd64 # FIXME: what exactly enables ompd? e.g. not enabled on armhf, mips64el, hurd-any OMPD_ARCHS = amd64 arm64 loong64 ppc64 ppc64el riscv64 @@ -721,7 +721,7 @@ endif # Enable offloading (or not) -OFFLOAD_ARCHS = amd64 arm64 loong64 ppc64el riscv64 +OFFLOAD_ARCHS = amd64 arm64 loong64 riscv64 OFFLOAD_ENABLE=yes ifeq (,$(filter $(DEB_HOST_ARCH), $(OFFLOAD_ARCHS))) OFFLOAD_ENABLE=no