Bug#1014860: buster-pu: package llvm-toolchain-13/1:13.0.1-6~deb10u1
Control: retitle -1 buster-pu: package llvm-toolchain-13/1:13.0.1-6~deb10u2
On 13/07/2022 12:55, Emilio Pozuelo Monfort wrote:
Package: release.debian.org
Severity: normal
Tags: buster
User: release.debian.org@packages.debian.org
Usertags: pu
X-Debbugs-Cc: pkg-llvm-team@lists.alioth.debian.org
This backports LLVM 13 to buster, for Firefox/Thunderbird ESR 102.
The changes from the bullseye backport are minimal, debdiff attached.
I have already uploaded the package, but let me know if you have any
comments.
I have noticed a couple of problems:
- there's a build-dep that worked for me because of the alternative, but didn't
in the buildds. I have addressed that here.
- I brought back mips support
I have uploaded deb10u2, debdiff attached. Let's see if that works better.
Cheers,
Emilio
diff -Nru llvm-toolchain-13-13.0.1/debian/changelog llvm-toolchain-13-13.0.1/debian/changelog
--- llvm-toolchain-13-13.0.1/debian/changelog 2022-07-06 16:28:45.000000000 +0200
+++ llvm-toolchain-13-13.0.1/debian/changelog 2022-07-15 11:10:37.000000000 +0200
@@ -1,3 +1,11 @@
+llvm-toolchain-13 (1:13.0.1-6~deb10u2) buster; urgency=medium
+
+ * Don't build-dep on llvm-spirv, it's not available in buster
+ and having an alternative doesn't work on the buildds.
+ * Add support for mips in various places.
+
+ -- Emilio Pozuelo Monfort <pochu@debian.org> Fri, 15 Jul 2022 11:10:37 +0200
+
llvm-toolchain-13 (1:13.0.1-6~deb10u1) buster; urgency=medium
* Non-maintainer upload.
diff -Nru llvm-toolchain-13-13.0.1/debian/clang-tools-X.Y.install.in llvm-toolchain-13-13.0.1/debian/clang-tools-X.Y.install.in
--- llvm-toolchain-13-13.0.1/debian/clang-tools-X.Y.install.in 2022-06-04 15:29:01.000000000 +0200
+++ llvm-toolchain-13-13.0.1/debian/clang-tools-X.Y.install.in 2022-07-15 11:10:37.000000000 +0200
@@ -55,7 +55,7 @@
usr/lib/llvm-@LLVM_VERSION@/libexec/intercept-c++
usr/lib/llvm-@LLVM_VERSION@/libexec/intercept-cc
-[!armel !armhf !ppc64el !hurd-any !s390x !powerpc !ppc64 !mipsel !mips64el !sparc64 !riscv64] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/bin/hwasan_symbolize
+[!armel !armhf !ppc64el !hurd-any !s390x !powerpc !ppc64 !mips !mipsel !mips64el !sparc64 !riscv64] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/bin/hwasan_symbolize
clang/tools/scan-build-@LLVM_VERSION@ usr/share/clang/
clang/tools/scan-view-@LLVM_VERSION@ usr/share/clang/
diff -Nru llvm-toolchain-13-13.0.1/debian/control llvm-toolchain-13-13.0.1/debian/control
--- llvm-toolchain-13-13.0.1/debian/control 2022-06-04 15:30:01.000000000 +0200
+++ llvm-toolchain-13-13.0.1/debian/control 2022-07-15 11:10:37.000000000 +0200
@@ -14,7 +14,7 @@
libxml2-dev,
libjsoncpp-dev, pkg-config,
lcov, procps, help2man, zlib1g-dev,
- g++-multilib [amd64 i386 kfreebsd-amd64 mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32],
+ g++-multilib [amd64 i386 kfreebsd-amd64 mips mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32],
libjs-mathjax, python3-recommonmark,
doxygen, gfortran,
ocaml-base [amd64 arm64 armhf ppc64el riscv64 s390x] | ocaml-nox [amd64 arm64 armhf ppc64el riscv64 s390x],
@@ -22,12 +22,12 @@
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 [ amd64 arm64 armel armhf mips64el mipsel ppc64el s390x ] <!stage1> | hello [!i386],
+# llvm-spirv [ amd64 arm64 armel armhf mips mips64el mipsel ppc64el s390x ] <!stage1> | hello [!i386],
spirv-tools [ linux-any ] | hello [ !i386],
- libgrpc++-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],
- protobuf-compiler-grpc [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],
- libprotobuf-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],
- protobuf-compiler [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x]
+ libgrpc++-dev [amd64 arm64 armel armhf mips mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],
+ protobuf-compiler-grpc [amd64 arm64 armel armhf mips mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],
+ libprotobuf-dev [amd64 arm64 armel armhf mips mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x],
+ protobuf-compiler [amd64 arm64 armel armhf mips mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x]
# "| hello" is for older buster/bionic distros without spirv support
Build-Conflicts: oprofile
Standards-Version: 4.2.1
@@ -465,7 +465,7 @@
# ------------- lld -------------
Package: lld-13
-Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64
+Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64
# ia64 hurd powerpc have been removed
Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm13 (= ${binary:Version})
Pre-Depends: ${misc:Pre-Depends}
@@ -475,7 +475,7 @@
Project.
Package: liblld-13
-Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64
+Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64
# ia64 hurd powerpc have been removed
Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm13 (= ${binary:Version})
Pre-Depends: ${misc:Pre-Depends}
@@ -489,7 +489,7 @@
Package: liblld-13-dev
Section: libdevel
-Architecture: amd64 arm64 armel armhf i386 mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64
+Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc alpha hppa m68k powerpcspe ppc64 sh4 sparc64 x32 riscv64
# ia64 hurd powerpc have been removed
Depends: ${shlibs:Depends}, ${misc:Depends}, lld-13 (= ${binary:Version}),
liblld-13 (= ${binary:Version})
diff -Nru llvm-toolchain-13-13.0.1/debian/rules llvm-toolchain-13-13.0.1/debian/rules
--- llvm-toolchain-13-13.0.1/debian/rules 2022-06-04 15:30:04.000000000 +0200
+++ llvm-toolchain-13-13.0.1/debian/rules 2022-07-15 11:10:37.000000000 +0200
@@ -96,7 +96,7 @@
STAGE_1_CMAKE_EXTRA += -DLLVM_PARALLEL_LINK_JOBS=4
endif
-ifneq (,$(filter $(DEB_HOST_ARCH),i386 hurd-i386 kfreebsd-i386 armel mipsel powerpc powerpcspe riscv64))
+ifneq (,$(filter $(DEB_HOST_ARCH),i386 hurd-i386 kfreebsd-i386 armel mips mipsel powerpc powerpcspe riscv64))
# For some reason, in the stage2 build, when clang is used to compile
# itself. The atomic detection is failing on armel and riscv64. Forcing the inclusion
# everywhere and in all stages
@@ -267,7 +267,7 @@
# Enable openmp (or not)
OPENMP_ENABLE=yes
-ifneq (,$(filter $(DEB_HOST_ARCH), m68k mipsel powerpc powerpcspe sparc64 s390x x32))
+ifneq (,$(filter $(DEB_HOST_ARCH), m68k mips mipsel powerpc powerpcspe sparc64 s390x x32))
OPENMP_ENABLE=no
else
RUNTIMES+=;openmp
@@ -292,7 +292,7 @@
endif
# llvm tests timeout, disable it on mipsel
-ifeq (mipsel,$(DEB_HOST_ARCH))
+ifneq (,$(filter $(DEB_HOST_ARCH), mips mipsel))
RUN_TEST=no
endif
@@ -374,7 +374,7 @@
LIBFUZZER_ENABLE=no
endif
-ifneq (,$(filter $(DEB_HOST_ARCH), mipsel))
+ifneq (,$(filter $(DEB_HOST_ARCH), mips mipsel))
LIBOMP_ARCH = mips
endif
Reply to: