From c747f322da1bfda56168e72c9b4240a52e818940 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Wed, 15 Nov 2023 17:54:36 +0100 Subject: [PATCH 01/14] Further limit the number of parallel processes --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 31433ceb..0524aa63 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 From 02bfadc696c39c5b7dc25303cbffc77aa1b28d54 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Wed, 15 Nov 2023 17:54:44 +0100 Subject: [PATCH 02/14] Update changelog --- debian/changelog | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e52d9c81..9b3471e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,11 @@ -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 + + -- Gianfranco Costamagna Wed, 15 Nov 2023 17:26:48 +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 @@ -6,7 +13,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 supstream release + + -- Sylvestre Ledru Tue, 14 Nov 2023 11:27:22 +0100 llvm-toolchain-17 (1:17.0.4-1) unstable; urgency=medium From 4c24440f8713e1ec1ef2ff67527dd90f85f4604e Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Fri, 17 Nov 2023 08:44:12 +0100 Subject: [PATCH 03/14] * Don't build-depend on llvm-spirv-17 on armel and mipsel (LLVM 17 is not yet built on these architectures). --- debian/changelog | 2 ++ debian/control | 5 +++-- debian/control.in | 5 +++-- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9b3471e2..2bc71001 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ 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). -- Gianfranco Costamagna Wed, 15 Nov 2023 17:26:48 +0100 diff --git a/debian/control b/debian/control index cd9824a2..c6272ae3 100644 --- a/debian/control +++ b/debian/control @@ -23,8 +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 [!i386], - spirv-tools [ linux-any ] | hello [ !i386], +# llvm-spirv-17 [amd64 arm64 armel armhf i386 mips64el ppc64 ppc64el riscv64 s390x] | hello [!i386], + llvm-spirv-17 [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] | hello [!i386], + spirv-tools [linux-any] | hello [ !i386], wasi-libc | hello [ !any-i386], libcurl4-openssl-dev | libcurl-dev, libgrpc++-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x], diff --git a/debian/control.in b/debian/control.in index a80b6eb2..efc07998 100644 --- a/debian/control.in +++ b/debian/control.in @@ -23,8 +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 [!i386], - spirv-tools [ linux-any ] | hello [ !i386], +# llvm-spirv-17 [amd64 arm64 armel armhf i386 mips64el ppc64 ppc64el riscv64 s390x] | hello [!i386], + llvm-spirv-17 [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] | hello [!i386], + spirv-tools [linux-any] | hello [ !i386], wasi-libc | hello [ !any-i386], libcurl4-openssl-dev | libcurl-dev, libgrpc++-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x], From cce043eec0e0a253b21da06ef03c5f996e742036 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Fri, 17 Nov 2023 08:56:12 +0100 Subject: [PATCH 04/14] Fix typos --- debian/changelog | 2 +- debian/rules | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2bc71001..5cbffbdd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,7 +16,7 @@ llvm-toolchain-17 (1:17.0.5-1) unstable; urgency=medium * Build-depend on llvm-spirv-17. [ Sylvestre Ledru ] - * New supstream release + * New upstream release -- Sylvestre Ledru Tue, 14 Nov 2023 11:27:22 +0100 diff --git a/debian/rules b/debian/rules index 0524aa63..3a3c8039 100755 --- a/debian/rules +++ b/debian/rules @@ -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 From 4e522af7c850c49aa9122405fa7d8159d11da94f Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 20 Nov 2023 19:35:31 +0100 Subject: [PATCH 05/14] Add a symlink for libc++experimental.a to /usr/lib/*/libc++experimental.a to fix https://github.com/llvm/llvm-project/issues/72753 --- debian/changelog | 6 +++++- debian/libc++abi-X.Y-dev.links.in | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5cbffbdd..4e15b57a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,7 +5,11 @@ llvm-toolchain-17 (1:17.0.5-2) UNRELEASED; urgency=medium * Don't build-depend on llvm-spirv-17 on armel and mipsel (LLVM 17 is not yet built on these architectures). - -- Gianfranco Costamagna Wed, 15 Nov 2023 17:26:48 +0100 + [ 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 + + -- Sylvestre Ledru Mon, 20 Nov 2023 19:34:35 +0100 llvm-toolchain-17 (1:17.0.5-1) unstable; urgency=medium 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 From edfb1e171ef54496eacdc9a3307b1f0948460385 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 22 Nov 2023 00:21:48 +0100 Subject: [PATCH 06/14] relax the wasi-libc dep declaration --- debian/control | 2 +- debian/control.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index c6272ae3..e7cbb886 100644 --- a/debian/control +++ b/debian/control @@ -26,7 +26,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, # llvm-spirv-17 [amd64 arm64 armel armhf i386 mips64el ppc64 ppc64el riscv64 s390x] | hello [!i386], llvm-spirv-17 [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] | hello [!i386], spirv-tools [linux-any] | hello [ !i386], - wasi-libc | hello [ !any-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/control.in b/debian/control.in index efc07998..90a72843 100644 --- a/debian/control.in +++ b/debian/control.in @@ -26,7 +26,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, # llvm-spirv-17 [amd64 arm64 armel armhf i386 mips64el ppc64 ppc64el riscv64 s390x] | hello [!i386], llvm-spirv-17 [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] | hello [!i386], spirv-tools [linux-any] | hello [ !i386], - wasi-libc | hello [ !any-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], From cfffa8ace2a2fa3f2d6dceb57144d2f45c261b28 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 22 Nov 2023 00:22:06 +0100 Subject: [PATCH 07/14] refresh debian/control with control.in changes --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index e7cbb886..de5daf26 100644 --- a/debian/control +++ b/debian/control @@ -169,7 +169,7 @@ Description: Clang library - Development package Package: libclang-common-17-dev Architecture: any Section: libdevel -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17 (>= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17 (= ${binary:Version}) Recommends: libclang-rt-17-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 From 789660216a3c8dfd9eb35cb0bb813120914cd7a4 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 22 Nov 2023 00:22:34 +0100 Subject: [PATCH 08/14] try to relax the wasi-libc dep declaration for apt.llvm.org --- debian/changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index 4e15b57a..c19414ca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ llvm-toolchain-17 (1:17.0.5-2) UNRELEASED; urgency=medium [ 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 -- Sylvestre Ledru Mon, 20 Nov 2023 19:34:35 +0100 From 363182564fde6bf322ca81c571ac070a7ba2d90e Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 22 Nov 2023 00:29:57 +0100 Subject: [PATCH 09/14] add a check that, if we are going to build wasm, wasi-libc is installed on the system --- debian/changelog | 2 ++ debian/rules | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index c19414ca..ab4a95bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ llvm-toolchain-17 (1:17.0.5-2) UNRELEASED; urgency=medium * 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 diff --git a/debian/rules b/debian/rules index 3a3c8039..6a8accb3 100755 --- a/debian/rules +++ b/debian/rules @@ -628,6 +628,12 @@ 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"; \ + exit 1; \ + fi; \ fi # Conditionally enable install clangd grpc files From a747b6c7849947920f9fc66b6a5dd771e5e868d2 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 14 Nov 2023 11:27:35 +0100 Subject: [PATCH 10/14] * New supstream release * New snapshot release --- debian/changelog | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/debian/changelog b/debian/changelog index ab4a95bc..f805e407 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ llvm-toolchain-17 (1:17.0.5-2) UNRELEASED; urgency=medium 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 @@ -24,6 +25,16 @@ llvm-toolchain-17 (1:17.0.5-1) unstable; urgency=medium [ Sylvestre Ledru ] * New upstream release +======= + [ John Paul Adrian Glaubitz ] + * Don't run chrpath for libclang on sparc and sparc64 + + [ Matthias Klose ] + * Build-depend on llvm-spirv-17. + + [ Sylvestre Ledru ] + * New supstream release +>>>>>>> -- Sylvestre Ledru Tue, 14 Nov 2023 11:27:22 +0100 From 0c09647cd079d5a7550716f5a715e4a082a36abb Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 22 Nov 2023 09:18:06 +0100 Subject: [PATCH 11/14] fix syntax --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 6a8accb3..e31f5abc 100755 --- a/debian/rules +++ b/debian/rules @@ -628,7 +628,7 @@ 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; \ + 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"; \ From 19fe78dea03cc9e79a3a1e1daf8d68671d46d0f5 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 22 Nov 2023 10:36:34 +0100 Subject: [PATCH 12/14] fix conflict --- debian/changelog | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index f805e407..ab4a95bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,7 +16,6 @@ llvm-toolchain-17 (1:17.0.5-2) UNRELEASED; urgency=medium 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 @@ -25,16 +24,6 @@ llvm-toolchain-17 (1:17.0.5-1) unstable; urgency=medium [ Sylvestre Ledru ] * New upstream release -======= - [ John Paul Adrian Glaubitz ] - * Don't run chrpath for libclang on sparc and sparc64 - - [ Matthias Klose ] - * Build-depend on llvm-spirv-17. - - [ Sylvestre Ledru ] - * New supstream release ->>>>>>> -- Sylvestre Ledru Tue, 14 Nov 2023 11:27:22 +0100 From b5ccb8c06ff55b43a203c006996b04f3bddce9ff Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Wed, 22 Nov 2023 17:02:14 +0100 Subject: [PATCH 13/14] Drop extra spaces --- debian/control | 2 +- debian/control.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index de5daf26..05127efc 100644 --- a/debian/control +++ b/debian/control @@ -25,7 +25,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, libpfm4-dev [linux-any], python3-setuptools, libz3-dev, # llvm-spirv-17 [amd64 arm64 armel armhf i386 mips64el ppc64 ppc64el riscv64 s390x] | hello [!i386], llvm-spirv-17 [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] | hello [!i386], - spirv-tools [linux-any] | 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], diff --git a/debian/control.in b/debian/control.in index 90a72843..73e8d1d8 100644 --- a/debian/control.in +++ b/debian/control.in @@ -25,7 +25,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, libpfm4-dev [linux-any], python3-setuptools, libz3-dev, # llvm-spirv-17 [amd64 arm64 armel armhf i386 mips64el ppc64 ppc64el riscv64 s390x] | hello [!i386], llvm-spirv-17 [amd64 arm64 armhf i386 ppc64 ppc64el riscv64 s390x] | hello [!i386], - spirv-tools [linux-any] | 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], From a7ae059e081b74e70cf09439df40586b8e7dda47 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 22 Nov 2023 23:08:28 +0100 Subject: [PATCH 14/14] explain how to debug the issue --- debian/rules | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/rules b/debian/rules index e31f5abc..7b8438cd 100755 --- a/debian/rules +++ b/debian/rules @@ -632,6 +632,7 @@ stamps/preconfigure: 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