From: Raspbian automatic forward porter Date: Mon, 21 Feb 2022 16:37:32 +0000 (+0000) Subject: Merge version 1:13.0.1~+rc3-1~exp1+rpi1 and 1:13.0.1-3 to produce 1:13.0.1-3+rpi1 X-Git-Tag: archive/raspbian/1%14.0.4-4+rpi1^2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a14589c5efa435026e62ffb667f46ed909eadf62;p=llvm-toolchain-14.git Merge version 1:13.0.1~+rc3-1~exp1+rpi1 and 1:13.0.1-3 to produce 1:13.0.1-3+rpi1 --- a14589c5efa435026e62ffb667f46ed909eadf62 diff --cc debian/changelog index 113708a5d7,5d2f305433..b5114f35cd --- a/debian/changelog +++ b/debian/changelog @@@ -1,49 -1,30 +1,77 @@@ - llvm-toolchain-13 (1:13.0.1~+rc3-1~exp1+rpi1) bookworm-staging; urgency=medium ++llvm-toolchain-13 (1:13.0.1-3+rpi1) bookworm-staging; urgency=medium + + [changes brought forward from llvm-toolchain-3.8 1:3.8-2+rpi1 by Peter Michael Green at Sat, 14 May 2016 21:43:35 +0000] + * Cleanup .pyc files in clean target. + * Add a hack to the cmake based build to force armv6 (unfortunately the cmake + based build relies on config.guess which assumes you want to build for the + hardware you are running on). + * Add -DCOMPILER_RT_BUILD_BUILTINS=OFF to disable parts of compiler-rt that + are broken on lower arm architectures. + + [changes introduced in llvm-toolchain-3.9 1:3.9.1-1 by Peter Michael Green] + * disable testsuite (using a method that is hopefully less likely to cause diff conflicts than previously). + * Remove -march=armv7-a in compiler-rt/cmake/config-ix-base.cmake + * Clean up debian/usr in clean target. + * Clean up clang/tools/*-3.9 in clean target. + * Clean up stray *3.9.vim files + * Clean up clang/tools/scan-build/man/scan-build-3.9.1 and utils/vim/llvm-3.9-vimrc + * Clean up debian/*.install + + [changes introduced in llvm-toolchain-6.0 1:6.0-1+rpi1 by Peter michael green] + * create build-llvm/docs/ocamldoc/html/ so the install target doesn't complain + about it not existing. + * clean up more crap left behind by build process. + + [changes introduced in llvm-toolchain-6.0 1:6.0-3+rpi1 by Peter Michael Green] + * Remove debian/man in clean target. + + [changes introduced in llvm-toolchain-7 1:7-6+rpi1 by Peter Michael Green] + * Use libatomic on armhf + * Set cmake/config.guess.hack back to mode 644 in clean target to keep + git/dgit happy. + * Yet more clean target fixes. + + [changes introduced in llvm-toolchain-7 1:7.0.1-1+rpi2 by Peter Michael Green] + * Change triplet in debian/rules to use armv6k rather than armv7l + + [changes introduced in llvm-toolchain-12 1:12.0.1-16 by Peter Michael Green] + * Disable llvm libunwind on armhf, it seems to come out armv7 contaminated. + + [changes introduced in llvm-toolchain-13 (1:13.0.0-9+rpi1 by Peter Michael Green] + * Disable scudo on armhf, it needs atomics which we do not want to enable. + + [changes brought forward from 1:13.0.0-9+rpi2 by Peter Michael Green at Tue, 23 Nov 2021 22:37:30 +0000] + * Remove armhf from architecture list for libunwind-13-dev dependency. + - -- Peter Michael Green Thu, 10 Feb 2022 16:53:49 +0000 ++ -- Raspbian forward porter Mon, 21 Feb 2022 16:37:30 +0000 ++ + llvm-toolchain-13 (1:13.0.1-3) unstable; urgency=medium + + * Fix a typo in an header (closes: #1005195) + + * Also install usr/lib/llvm-@LLVM_VERSION@/lib/libRemoteIndexProto.a + usr/lib/llvm-@LLVM_VERSION@/lib/libRemoteIndexServiceProto.a + usr/lib/llvm-@LLVM_VERSION@/lib/libMonitoringServiceProto.a + in libclang-X.Y-dev + (Closes: #1005666) + + -- Sylvestre Ledru Tue, 08 Feb 2022 21:39:18 +0100 + + llvm-toolchain-13 (1:13.0.1-2) unstable; urgency=medium + + * mlir: use the cmake option to avoid installing object files + MLIR_INSTALL_AGGREGATE_OBJECTS + Closes upstream #53134 + * Build clangd with GRPC support + Thanks to Sam McCall for the patch + + -- Sylvestre Ledru Wed, 05 Jan 2022 23:21:56 +0100 + + llvm-toolchain-13 (1:13.0.1-1) unstable; urgency=medium + + * New stable release + + -- Sylvestre Ledru Thu, 03 Feb 2022 10:21:56 +0100 llvm-toolchain-13 (1:13.0.1~+rc3-1~exp1) experimental; urgency=medium diff --cc debian/control index e361441f95,05e4df58b7..99efe3449d --- a/debian/control +++ b/debian/control @@@ -18,15 -18,19 +18,17 @@@ Build-Depends: debhelper (>= 10.0), cma libjs-mathjax, python3-recommonmark, doxygen, gfortran, ocaml-base [amd64 arm64 armhf ppc64el riscv64 s390x] | ocaml-nox [amd64 arm64 armhf ppc64el riscv64 s390x], - ocaml-findlib [amd64 arm64 armhf ppc64el riscv64 s390x], - libctypes-ocaml-dev [amd64 arm64 armhf ppc64el riscv64 s390x], - dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el riscv64 s390x], + ocaml-findlib [amd64 arm64 armhf ppc64el s390x], + libctypes-ocaml-dev [amd64 arm64 armhf ppc64el s390x], + dh-exec, dh-ocaml [amd64 arm64 armhf ppc64el s390x], - libpfm4-dev [linux-any], python3-setuptools, libz3-dev + libpfm4-dev [linux-any], python3-setuptools, libz3-dev, - llvm-spirv [ amd64 arm64 armel armhf mips64el mipsel ppc64el s390x ] | hello [!i386], - spirv-tools [ linux-any ] | hello [ !i386], + libgrpc++-dev, libprotobuf-dev, protobuf-compiler, protobuf-compiler-grpc + # "| hello" is for older buster/bionic distros without spirv support -Build-Conflicts: oprofile +Build-Conflicts: oprofile, libllvm-3.8-ocaml-dev, libllvm-3.9-ocaml-dev Standards-Version: 4.2.1 Homepage: https://www.llvm.org/ - Vcs-Git: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain.git -b snapshot - Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/snapshot + Vcs-Git: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain.git -b 13 + Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/13 # ------------- clang ------------- diff --cc debian/patches/series index ad8a6ffa9d,083272b511..08bef88735 --- a/debian/patches/series +++ b/debian/patches/series @@@ -126,4 -152,4 +126,5 @@@ compilerrt-builtins-arch-fix-armhf.dif compilerrt-build-scudo-standalone-option.diff use-gold-for-compiler-rt-when-set.diff wasm-ld-path.diff + fix-typo.diff +raspbian-triplet.patch diff --cc debian/rules index 35a3c2db35,110bcad916..c75aaf8714 --- a/debian/rules +++ b/debian/rules @@@ -409,13 -418,9 +425,15 @@@ preconfigure @echo "LLVM_VERSION=$(LLVM_VERSION)" @echo "LLVM_VERSION_FULL=$(LLVM_VERSION_FULL)" @echo "LLVM_VERSION_SNAPSHOT=$(LLVM_VERSION_SNAPSHOT)" + @echo "PATH=$(PATH)" + @echo "LD_LIBRARY_PATH=$(LD_LIBRARY_PATH)" + # add executable flag to script we added as part of triplet hack + # --plugwash + chmod 755 llvm/cmake/config.guess.hack + # also make sure config.guess is executable + chmod 755 llvm/cmake/config.guess + for f in debian/*.in; do \ f2=$$(echo $$f | sed 's/\.in$$//;s/X\.Y/$(LLVM_VERSION)/'); \ echo "$$f => $$f2"; \