From b98823b985fe40a70abc64385db2fbcae29f30eb Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 18 Mar 2023 09:54:56 +0100 Subject: [PATCH 1/8] repack: remove build/ & build-llvm/ in case it exists --- debian/orig-tar.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh index e277ad08..bca132c1 100755 --- a/debian/orig-tar.sh +++ b/debian/orig-tar.sh @@ -155,7 +155,7 @@ else fi # cleanup -rm -rf */www/ +rm -rf */www/ build/ build-llvm/ cd ../ BASE="llvm-toolchain-${MAJOR_VERSION}_${VERSION}" From 179cd18f35dbeb24621bce77fb2ef4258110957d Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 18 Mar 2023 09:57:52 +0100 Subject: [PATCH 2/8] remove artifact if they exists --- debian/rules | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/rules b/debian/rules index 8e44e5fe..e42d29c0 100755 --- a/debian/rules +++ b/debian/rules @@ -576,6 +576,9 @@ override_dh_auto_configure: preconfigure $(CC) -v $(CXX) -v mkdir -p $(TARGET_BUILD) +# remove in case of artifact + rm -rf build + if test "$(SCAN_BUILD)" = "yes"; then \ patch -f -p1 < debian/patches/on-the-fly/use-scan-build-runtimes.diff||true; \ fi From 61e79299327c9ea0bf404fc56078c7cbe83a3324 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 18 Mar 2023 10:00:25 +0100 Subject: [PATCH 3/8] Remove build artifacts if any --- debian/changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index ef4bce9d..30fbbbfb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ llvm-toolchain-15 (1:15.0.7-4) UNRELEASED; urgency=medium * Fix debian/libclang1-15.symbols soname + * Remove build artifacts if any -- Sylvestre Ledru Wed, 15 Mar 2023 21:45:46 +0100 From f1e18209f463c2f75ef491615387230337baeb77 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 18 Mar 2023 21:42:19 +0100 Subject: [PATCH 4/8] * New upstream release --- debian/changelog | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index fd7b441e..4d25de3b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-16 (1:16.0.0-1~exp1) experimental; urgency=medium + + * New upstream release + + -- Sylvestre Ledru Sat, 18 Mar 2023 21:41:44 +0100 + llvm-toolchain-16 (1:16.0.0~+rc4-1~exp1) experimental; urgency=medium * New snapshot release @@ -144,6 +150,12 @@ llvm-toolchain-15 (1:15.0.7-2) unstable; urgency=medium -- Sylvestre Ledru Sun, 15 Jan 2023 10:54:41 +0100 +llvm-toolchain-15 (1:15.0.7-1~exp1) UNRELEASED; urgency=medium + + * experimental New snapshot release + + -- Sylvestre Ledru Fri, 13 Jan 2023 15:12:11 +0100 + llvm-toolchain-15 (1:15.0.7-1) unstable; urgency=medium * New upstream release @@ -165,6 +177,12 @@ llvm-toolchain-15 (1:15.0.6-5~exp2) experimental; urgency=medium -- Sylvestre Ledru Fri, 06 Jan 2023 13:19:48 +0100 +llvm-toolchain-15 (1:15.0.6~++20230102020141+088f33605d8a-1~exp1) UNRELEASED; urgency=medium + + * experimental New snapshot release + + -- Sylvestre Ledru Mon, 02 Jan 2023 14:01:53 +0100 + llvm-toolchain-15 (1:15.0.6-5~exp1) experimental; urgency=medium * Add flang-15 and libraries support @@ -246,11 +264,14 @@ llvm-toolchain-15 (1:15.0.5-2) unstable; urgency=medium -- Gianfranco Costamagna Sat, 19 Nov 2022 23:25:04 +0100 llvm-toolchain-15 (1:15.0.5-1) unstable; urgency=medium +llvm-toolchain-15 (1:15.0.5-1~exp1) UNRELEASED; urgency=medium * New upstream release * Remove the swig patches (applied upstream) + * experimental New snapshot release + * experimental New snapshot release - -- Sylvestre Ledru Wed, 16 Nov 2022 09:11:01 +0100 + -- Sylvestre Ledru Wed, 16 Nov 2022 09:02:30 +0100 llvm-toolchain-15 (1:15.0.4-1) unstable; urgency=medium From 2c5ae84c9eac7055686ffd92061bc6cd91f466a2 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 18 Mar 2023 21:43:22 +0100 Subject: [PATCH 5/8] fix changelog --- debian/changelog | 1 - 1 file changed, 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9db299fd..48ef99ab 100644 --- a/debian/changelog +++ b/debian/changelog @@ -265,7 +265,6 @@ llvm-toolchain-15 (1:15.0.5-2) unstable; urgency=medium -- Gianfranco Costamagna Sat, 19 Nov 2022 23:25:04 +0100 llvm-toolchain-15 (1:15.0.5-1) unstable; urgency=medium -llvm-toolchain-15 (1:15.0.5-1~exp1) UNRELEASED; urgency=medium * New upstream release * Remove the swig patches (applied upstream) From 8831aec23fe63004e19b7be7f18c4d68f03f33f0 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Tue, 21 Mar 2023 10:17:37 +0100 Subject: [PATCH 6/8] [ Matthias Klose ] * Install liborc_rt-armhf.a on armhf. * Don't ship gdb scripts for ompd on armhf. * Don't run MLIR tests on armhf, timeouts on the buildds. --- debian/libclang-rt-X.Y-dev.install.in | 4 ++-- debian/libomp-X.Y-dev.install.in | 2 +- debian/rules | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/libclang-rt-X.Y-dev.install.in b/debian/libclang-rt-X.Y-dev.install.in index d8eecf40..8891a735 100644 --- a/debian/libclang-rt-X.Y-dev.install.in +++ b/debian/libclang-rt-X.Y-dev.install.in @@ -6,5 +6,5 @@ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/lib/linux/*clang_rt* usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/README.txt usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/fuzzer/ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/orc/c_api.h -# See cmake/Modules/AllSupportedArchDefs.cmake / ALL_ORC_SUPPORTED_ARCH -[amd64 arm64 i386] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/lib/linux/liborc_rt* +# See compiler-rt/cmake/Modules/AllSupportedArchDefs.cmake / ALL_ORC_SUPPORTED_ARCH +[amd64 armhf arm64 i386] usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/lib/linux/liborc_rt* diff --git a/debian/libomp-X.Y-dev.install.in b/debian/libomp-X.Y-dev.install.in index 856a798f..081d2c52 100644 --- a/debian/libomp-X.Y-dev.install.in +++ b/debian/libomp-X.Y-dev.install.in @@ -19,4 +19,4 @@ usr/lib/llvm-@LLVM_VERSION@/lib/cmake/openmp/*.cmake [amd64 arm64 mips64el ppc64el ppc64 riscv64] usr/bin/llvm-omp-device-info-@LLVM_VERSION@ [amd64 arm64 mips64el ppc64el ppc64 riscv64] usr/bin/llvm-omp-kernel-replay-@LLVM_VERSION@ -usr/lib/llvm-@LLVM_VERSION@/share/gdb/python/ompd/ +[!armhf] usr/lib/llvm-@LLVM_VERSION@/share/gdb/python/ompd/ diff --git a/debian/rules b/debian/rules index 0ac28818..21228a72 100755 --- a/debian/rules +++ b/debian/rules @@ -1319,7 +1319,7 @@ endif ninja $(VERBOSE) -C $(TARGET_BUILD_STAGE2) check-libcxxabi || true # MLIR -ifeq (,$(filter $(DEB_HOST_ARCH), i386 x32)) +ifeq (,$(filter $(DEB_HOST_ARCH), armhf i386 x32)) # Do not run MLIR test on i386 because of # https://github.com/llvm/llvm-project/issues/58357 ninja $(VERBOSE) -C $(TARGET_BUILD_STAGE2) check-mlir || true From 617b5f460c88c1af14ac1840f6452ade97b5441e Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Tue, 21 Mar 2023 10:17:58 +0100 Subject: [PATCH 7/8] Tentatively use gold on riscv64, to see if the build goes successfully --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 21228a72..3d0d5aad 100755 --- a/debian/rules +++ b/debian/rules @@ -278,7 +278,7 @@ ifeq ($(LLVM_SPIRV_INSTALLED),yes) LIBCLC_LLVM_SPIRV = "-DLLVM_SPIRV=$(LLVM_SPIRV)" endif -BINUTILS_GOLD_ARCHS := amd64 arm64 armhf i386 ppc64 ppc64el x32 s390x hurd-i386 kfreebsd-amd64 kfreebsd-i386 +BINUTILS_GOLD_ARCHS := amd64 arm64 armhf i386 ppc64 ppc64el riscv64 x32 s390x hurd-i386 kfreebsd-amd64 kfreebsd-i386 ifeq ($(shell dpkg --compare-versions $(shell dpkg-query -W -f '$${Version}' binutils) ge 2.23.1-1~exp3 ; echo $$?),0) ifneq (,$(filter $(DEB_HOST_ARCH),$(BINUTILS_GOLD_ARCHS))) STAGE_ALL_CMAKE_EXTRA += -DLLVM_USE_LINKER=gold From 5ffe408ba2a8b8592116585dc557d6fe8748bf2d Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Tue, 21 Mar 2023 10:18:43 +0100 Subject: [PATCH 8/8] Update changelog, upload to experimental --- debian/changelog | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/debian/changelog b/debian/changelog index 48ef99ab..3430882a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +llvm-toolchain-16 (1:16.0.0-1~exp2) experimental; urgency=medium + + [ Matthias Klose ] + * Install liborc_rt-armhf.a on armhf. + * Don't ship gdb scripts for ompd on armhf. + * Don't run MLIR tests on armhf, timeouts on the buildds. + + [ Gianfranco Costamagna ] + * Try to use gold linker on riscv64, to see if the build goes to + the end successfully + + -- Gianfranco Costamagna Tue, 21 Mar 2023 09:41:39 +0100 + llvm-toolchain-16 (1:16.0.0-1~exp1) experimental; urgency=medium * New upstream release