From: Raspbian automatic forward porter Date: Tue, 28 Feb 2023 02:40:23 +0000 (+0000) Subject: Merge version 1:14.0.6-10+rpi1 and 1:14.0.6-12 to produce 1:14.0.6-12+rpi1 X-Git-Tag: archive/raspbian/1%14.0.6-12+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=45c07d3dd973f89eb190f1099ab73de0aa7353e9;p=llvm-toolchain-14.git Merge version 1:14.0.6-10+rpi1 and 1:14.0.6-12 to produce 1:14.0.6-12+rpi1 --- 45c07d3dd973f89eb190f1099ab73de0aa7353e9 diff --cc debian/changelog index b2cd96eaa5,1186631089..6c10a203ce --- a/debian/changelog +++ b/debian/changelog @@@ -1,49 -1,34 +1,81 @@@ - llvm-toolchain-14 (1:14.0.6-10+rpi1) bookworm-staging; urgency=medium ++llvm-toolchain-14 (1:14.0.6-12+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, 12 Jan 2023 18:05:13 +0000 ++ -- Raspbian forward porter Tue, 28 Feb 2023 02:40:20 +0000 ++ + llvm-toolchain-14 (1:14.0.6-12) unstable; urgency=medium + + [ Samuel Thibault ] + * Fix hurd build due to missing shared libclang-rt + * Fix installation conflict between libclang_rt from libclang-rt-14-dev and + libclang-rt-14-dev-wasm*. + + -- Gianfranco Costamagna Fri, 17 Feb 2023 12:57:29 +0100 + + llvm-toolchain-14 (1:14.0.6-11) unstable; urgency=medium + + [ Sylvestre Ledru ] + * Update SV to 4.6.2 + * Disable libc++-$(LLVM_VERSION)-dev-wasm32 on old Debian & Ubuntu: + bionic buster focal bullseye jammy + either wasi-libc isn't available or too old or we face bug + https://sourceware.org/bugzilla/show_bug.cgi?id=27558 + * adjust the lintian override format with the [] + * hardcode a bit less sccache usage + + [ Gianfranco Costamagna ] + * Fix riscv64 build by adding spirv again (from @paravoid) + * debian/patches/libclang-cpp-test-link-failure.patch: Cherry-pick + and change in a minimal way, upstream patch to fix underlinking + with as-needed default flag (Closes: #1027013) + * Ignore some wasm32 failures with c++ for now + + [ Samuel Thibault ] + * Fix hurd build by fixing Linux-specific lines. + + -- Gianfranco Costamagna Thu, 16 Feb 2023 10:44:03 +0100 llvm-toolchain-14 (1:14.0.6-10) unstable; urgency=medium diff --cc debian/control index 82f8a98667,0de9d68003..76f7585686 --- a/debian/control +++ b/debian/control @@@ -18,11 -18,12 +18,11 @@@ Build-Depends: debhelper (>= 10.0), cma libjs-mathjax, python3-recommonmark, doxygen, 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, - llvm-spirv-14 [ amd64 arm64 armel armhf mips64el mipsel ppc64el s390x ] | hello [!i386], + llvm-spirv-14 [ amd64 arm64 armel armhf mips64el mipsel ppc64el riscv64 s390x ] | hello [!i386], - spirv-tools [ linux-any ] | hello [ !i386], wasi-libc | hello [ !i386], libcurl4-dev, libgrpc++-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x], @@@ -30,8 -31,8 +30,8 @@@ 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] # "| 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 + Standards-Version: 4.6.2 Homepage: https://www.llvm.org/ Vcs-Git: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain.git -b 14 Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/14 diff --cc debian/control.in index 28efe213ba,6fdd5ccb8f..5fc6a8b9d7 --- a/debian/control.in +++ b/debian/control.in @@@ -31,8 -31,8 +31,8 @@@ Build-Depends: debhelper (>= 10.0), cma 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] # "| 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 + Standards-Version: 4.6.2 Homepage: https://www.llvm.org/ Vcs-Git: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain.git -b @BRANCH_NAME@ Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/@BRANCH_NAME@ diff --cc debian/patches/series index e8f27bae54,a10c00c847..ac5e7e5b25 --- a/debian/patches/series +++ b/debian/patches/series @@@ -133,4 -162,5 +133,6 @@@ lldb/lldb-swig-2.dif protobuf_3.21.patch basic_string.patch link-grpc.diff + libcxx-D124227-wasm.patch + libclang-cpp-test-link-failure.patch +raspbian-triplet.patch diff --cc debian/rules index c0adf6cbe6,ba4eea8cdf..17bc84d86a --- a/debian/rules +++ b/debian/rules @@@ -482,13 -497,8 +504,14 @@@ preconfigure @echo "LLVM_VERSION_SNAPSHOT=$(LLVM_VERSION_SNAPSHOT)" @echo "PATH=$(PATH)" @echo "LD_LIBRARY_PATH=$(LD_LIBRARY_PATH)" + @echo "LIBCXX_WASM_ENABLE=$(LIBCXX_WASM_ENABLE)" + # 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"; \