diff --git a/debian/changelog b/debian/changelog index 34398fd6..e1e8ad59 100644 --- a/debian/changelog +++ b/debian/changelog @@ -61,7 +61,23 @@ llvm-toolchain-snapshot (1:18~++20230725115106+b6847edfc235-1~exp1) experimental -- Sylvestre Ledru Tue, 25 Jul 2023 23:52:42 +0200 -llvm-toolchain-17 (1:17.0.4-2) UNRELEASED; urgency=medium +llvm-toolchain-17 (1:17.0.5-2) UNRELEASED; urgency=medium + + [ Matthias Klose ] + * Further limit the number of parallel processes + * Don't build-depend on llvm-spirv-17 on armel and mipsel (LLVM 17 is not + yet built on these architectures). + + [ Sylvestre Ledru ] + * Add a symlink for libc++experimental.a to /usr/lib/*/libc++experimental.a + to fix https://github.com/llvm/llvm-project/issues/72753 + * try to relax the wasi-libc dep declaration for apt.llvm.org + * add a check that, if we are going to build wasm, wasi-libc is installed + on the system + + -- Sylvestre Ledru Mon, 20 Nov 2023 19:34:35 +0100 + +llvm-toolchain-17 (1:17.0.5-1) unstable; urgency=medium [ John Paul Adrian Glaubitz ] * Don't run chrpath for libclang on sparc and sparc64 @@ -69,7 +85,10 @@ llvm-toolchain-17 (1:17.0.4-2) UNRELEASED; urgency=medium [ Matthias Klose ] * Build-depend on llvm-spirv-17. - -- John Paul Adrian Glaubitz Thu, 09 Nov 2023 10:07:49 +0100 + [ Sylvestre Ledru ] + * New upstream release + + -- Sylvestre Ledru Tue, 14 Nov 2023 11:27:22 +0100 llvm-toolchain-17 (1:17.0.2-1~exp1) experimental; urgency=medium diff --git a/debian/control b/debian/control index 30d3ecca..068a03bf 100644 --- a/debian/control +++ b/debian/control @@ -23,9 +23,9 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, 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-17 [ amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x ] | hello, - spirv-tools [ linux-any ] | hello [ !i386], - wasi-libc | hello [ !any-i386], + llvm-spirv-17 [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] | hello [!i386], + spirv-tools [linux-any] | hello [!i386], + wasi-libc | hello, libcurl4-openssl-dev | libcurl-dev, 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], @@ -168,7 +168,7 @@ Description: Clang library - Development package Package: libclang-common-18-dev Architecture: any Section: libdevel -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm18 (>= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm18 (= ${binary:Version}) Recommends: libclang-rt-18-dev (>= 1:16~++20230115053056+df5fc4504b86-1~exp1) Description: Clang library - Common development package Clang project is a C, C++, Objective C and Objective C++ front-end diff --git a/debian/control.in b/debian/control.in index 30cbdd9d..aca57233 100644 --- a/debian/control.in +++ b/debian/control.in @@ -23,9 +23,9 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, 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-17 [ amd64 arm64 armel armhf i386 mips64el ppc64el riscv64 s390x ] | hello, - spirv-tools [ linux-any ] | hello [ !i386], - wasi-libc | hello [ !any-i386], + llvm-spirv-17 [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] | hello [!i386], + spirv-tools [linux-any] | hello [!i386], + wasi-libc | hello, libcurl4-openssl-dev | libcurl-dev, 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], diff --git a/debian/libc++abi-X.Y-dev.links.in b/debian/libc++abi-X.Y-dev.links.in index 6dd5f555..e1814c9b 100644 --- a/debian/libc++abi-X.Y-dev.links.in +++ b/debian/libc++abi-X.Y-dev.links.in @@ -1 +1,2 @@ usr/lib/llvm-@LLVM_VERSION@/lib/libc++abi.so /usr/lib/@DEB_HOST_MULTIARCH@/libc++abi.so +usr/lib/llvm-@LLVM_VERSION@/lib/libc++experimental.a /usr/lib/@DEB_HOST_MULTIARCH@/libc++experimental.a diff --git a/debian/rules b/debian/rules index d7d87501..d976fb55 100755 --- a/debian/rules +++ b/debian/rules @@ -47,7 +47,7 @@ packages := $(shell dh_listpackages) # flang has some memory hogs, of up to 6.2gb per process. Limit the parallel jobs # based on the available memory ifneq (,$(filter flang-$(LLVM_VERSION), $(packages))) - MEM_PER_CPU=3900 + MEM_PER_CPU=4500 else MEM_PER_CPU=2100 endif @@ -274,7 +274,7 @@ ifndef LLVM_SPIRV endif # Disable spirv support for most of the distro versions -# It needs llvm-spirv-16 and it is rarely available +# It needs llvm-spirv-17 and it is rarely available # Be prescritive SPIRV_DISABLE_DISTRO := bionic buster lunar jammy focal buster bullseye bookworm ifndef LLVM_SPIRV @@ -636,6 +636,13 @@ stamps/preconfigure: if test "$(LIBCXX_WASM_ENABLE)" = "no"; then \ echo "" > debian/libc++-$(LLVM_VERSION)-dev-wasm32.install; \ echo "" > debian/libc++abi-$(LLVM_VERSION)-dev-wasm32.install; \ + else \ + if ! dpkg -l|grep -q wasi-libc; then \ + echo "Could not find wasi-libc on the system"; \ + echo "Please check that the package is available on the system"; \ + echo "it might be that the 'hello' package is installed by another constraint"; \ + exit 1; \ + fi; \ fi # Conditionally enable install clangd grpc files