From 8ca0e630b4b861bd71c1d28b222e3691cca54b8e Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 25 Jul 2023 18:25:34 +0200 Subject: [PATCH 01/14] prepare the 17 release --- debian/README | 2 +- debian/changelog | 2 +- debian/control | 8 ++++---- debian/prepare-new-release.sh | 12 ++++++------ debian/rules | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/debian/README b/debian/README index 654ba44c..3f514d5b 100644 --- a/debian/README +++ b/debian/README @@ -9,7 +9,7 @@ The current snapshot release is maintained in the "snapshot" branch. The easiest way to get all branches is probably to have one clone per version: -for f in 14 15 16 snapshot; do +for f in 14 15 16 17 snapshot; do git clone git@salsa.debian.org:pkg-llvm-team/llvm-toolchain.git -b $f $f done diff --git a/debian/changelog b/debian/changelog index ae33213b..f46ba603 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -llvm-toolchain-snapshot (1:17~++20230724083402+862b93a8095c-1~exp1) experimental; urgency=medium +llvm-toolchain-17 (1:17~++20230724083402+862b93a8095c-1~exp1) experimental; urgency=medium * Fix for real the libclang-rt-17-dev issue diff --git a/debian/control b/debian/control index 2e673c74..32437dc5 100644 --- a/debian/control +++ b/debian/control @@ -1,4 +1,4 @@ -Source: llvm-toolchain-snapshot +Source: llvm-toolchain-17 Section: devel Priority: optional Rules-Requires-Root: no @@ -35,8 +35,8 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, Build-Conflicts: oprofile Standards-Version: 4.6.2 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 17 +Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/17 # ------------- clang ------------- @@ -562,7 +562,7 @@ Description: LLVM-based linker, header files Package: lldb-17 Architecture: amd64 arm64 armel armhf i386 ppc64el kfreebsd-amd64 kfreebsd-i386 s390 s390x sparc hppa m68k sh4 x32 # ia64 hurd powerpc powerpcspe ppc64 alpha riscv64 s390x sparc64 mipsel mips64el have been removed -Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17 (= ${binary:Version}) +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm17 (= ${binary:Version}), python3-lldb-17 Pre-Depends: ${misc:Pre-Depends} Description: Next generation, high-performance debugger diff --git a/debian/prepare-new-release.sh b/debian/prepare-new-release.sh index 189482ad..69dcd4c8 100644 --- a/debian/prepare-new-release.sh +++ b/debian/prepare-new-release.sh @@ -1,10 +1,10 @@ #!/bin/sh -ORIG_VERSION=15 -TARGET_VERSION=16 -ORIG_VERSION_2=15_0 -TARGET_VERSION_2=16_0 -ORIG_VERSION_3=150 -TARGET_VERSION_3=160 +ORIG_VERSION=16 +TARGET_VERSION=17 +ORIG_VERSION_2=16_0 +TARGET_VERSION_2=17_0 +ORIG_VERSION_3=160 +TARGET_VERSION_3=170 LIST=`ls debian/control debian/orig-tar.sh debian/rules debian/patches/clang-analyzer-force-version.diff debian/patches/clang-format-version.diff debian/patches/python-clangpath.diff debian/patches/scan-build-clang-path.diff debian/patches/lldb-libname.diff debian/patches/fix-scan-view-path.diff debian/patches/lldb/lldb-addversion-suffix-to-llvm-server-exec.patch debian/patches/clang-tidy-run-bin.diff debian/patches/fix-scan-view-path.diff debian/README debian/patches/clang-analyzer-force-version.diff debian/patches/clang-tidy-run-bin.diff debian/tests/control debian/tests/integration-test-suite-test debian/unpack.sh debian/tests/cmake-test debian/patches/scan-build-py-fix-default-bin.diff` for F in $LIST; do diff --git a/debian/rules b/debian/rules index 12876980..ac0a301e 100755 --- a/debian/rules +++ b/debian/rules @@ -1002,7 +1002,7 @@ endif echo "Generating manpage of $$f"; \ LD_LIBRARY_PATH=$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/:/usr/lib/*/libfakeroot help2man --no-info --version-string=$(LLVM_VERSION) $(TARGET_BUILD_STAGE2)/bin/$$f > debian/man/$$f-$(LLVM_VERSION).1 || true; \ done - # Create the following directory regardless as libomp-16-doc + # Create the following directory regardless as libomp-XX-doc # is Architecture: all mkdir -p openmp/runtime/doc/doxygen/generated/html/ From 1ceb26af34eaa3fb692a09a409ce63906ec31ed7 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 15 Aug 2023 21:19:46 +0200 Subject: [PATCH 02/14] prepare upload --- debian/changelog | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index f46ba603..0bf92f07 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,10 @@ -llvm-toolchain-17 (1:17~++20230724083402+862b93a8095c-1~exp1) experimental; urgency=medium +llvm-toolchain-17 (1:17.0.0~+rc2-1~exp1) experimental; urgency=medium + * New snapshot release: + * Fix the libclang-rt-17-dev: ships + /usr/lib[...]/wasi/libclang_rt.builtins-wasm*.a, already in + libclang-rt-17-dev-wasm* (closes: #1041388) + * Also install llvm-debuginfod in llvm-X.Y * Fix for real the libclang-rt-17-dev issue -- Sylvestre Ledru Mon, 24 Jul 2023 08:33:29 +0200 From 40ed900ee9ddf7320f422d1e924e1887a80b9282 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 18 Aug 2023 12:05:48 +0200 Subject: [PATCH 03/14] prepare upload --- debian/changelog | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0bf92f07..6510446f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,17 +7,7 @@ llvm-toolchain-17 (1:17.0.0~+rc2-1~exp1) experimental; urgency=medium * Also install llvm-debuginfod in llvm-X.Y * Fix for real the libclang-rt-17-dev issue - -- Sylvestre Ledru Mon, 24 Jul 2023 08:33:29 +0200 - -llvm-toolchain-snapshot (1:17~++20230721092305+2ce662c5d596-1~exp1) experimental; urgency=medium - - * New snapshot release: - * Fix the libclang-rt-17-dev: ships - /usr/lib[...]/wasi/libclang_rt.builtins-wasm*.a, already in - libclang-rt-17-dev-wasm* (closes: #1041388) - * Also install llvm-debuginfod in llvm-X.Y - - -- Sylvestre Ledru Fri, 21 Jul 2023 09:26:43 +0200 + -- Sylvestre Ledru Tue, 15 Aug 2023 19:25:12 +0000 llvm-toolchain-snapshot (1:17~++20230709044550+c54ff51be9c1-1~exp1) experimental; urgency=medium From d9f80962c79c769e1a4537a74d6c82d00580cc8c Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 22 Aug 2023 19:23:53 +0200 Subject: [PATCH 04/14] New snapshot release --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 6510446f..2ba43d94 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-17 (1:17.0.0~+rc3-1~exp1) experimental; urgency=medium + + * New snapshot release + + -- Sylvestre Ledru Tue, 22 Aug 2023 19:22:57 +0200 + llvm-toolchain-17 (1:17.0.0~+rc2-1~exp1) experimental; urgency=medium * New snapshot release: From a9388fd4ca3d315a93a6f99357f8fbd45d5da717 Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Wed, 30 Aug 2023 11:44:48 +0200 Subject: [PATCH 05/14] Disable wasm support on powerpc and powerpcspe --- debian/changelog | 7 +++++++ debian/rules | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/debian/changelog b/debian/changelog index 2ba43d94..ed779edc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +llvm-toolchain-17 (1:17.0.0~+rc3-1~exp2) UNRELEASED; urgency=medium + + [ John Paul Adrian Glaubitz ] + * Disable wasm support on powerpc and powerpcspe + + -- John Paul Adrian Glaubitz Wed, 30 Aug 2023 11:44:06 +0200 + llvm-toolchain-17 (1:17.0.0~+rc3-1~exp1) experimental; urgency=medium * New snapshot release diff --git a/debian/rules b/debian/rules index ac0a301e..bb3466b9 100755 --- a/debian/rules +++ b/debian/rules @@ -409,6 +409,10 @@ ifeq (,$(filter-out $(LIBCXX_WASM_DISABLE_DISTRO), $(DISTRO))) LIBCXX_WASM_ENABLE=no endif +ifneq (,$(filter $(DEB_HOST_ARCH),powerpc powerpcspe)) + LIBCXX_WASM_ENABLE=no +endif + LLD_ENABLE=yes ifneq (,$(filter $(DEB_HOST_ARCH_OS),linux)) From 2549528c407225ffbd3ec09c465a8530af2c9928 Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Wed, 30 Aug 2023 11:45:37 +0200 Subject: [PATCH 06/14] Remove powerpc from BINUTILS_GOLD_ARCHS again --- debian/changelog | 1 + debian/rules | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index ed779edc..22f96625 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ llvm-toolchain-17 (1:17.0.0~+rc3-1~exp2) UNRELEASED; urgency=medium [ John Paul Adrian Glaubitz ] * Disable wasm support on powerpc and powerpcspe + * Remove powerpc from BINUTILS_GOLD_ARCHS again -- John Paul Adrian Glaubitz Wed, 30 Aug 2023 11:44:06 +0200 diff --git a/debian/rules b/debian/rules index bb3466b9..38f92b02 100755 --- a/debian/rules +++ b/debian/rules @@ -271,7 +271,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 powerpc hurd-i386 kfreebsd-amd64 kfreebsd-i386 +BINUTILS_GOLD_ARCHS := amd64 arm64 armhf i386 ppc64 ppc64el 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 7b269634e80455a65db038405c0ec92dd65bf34e Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 5 Sep 2023 14:38:20 +0200 Subject: [PATCH 07/14] debian/tests/control: update gcc to 10 => 13 --- debian/changelog | 6 ++++++ debian/tests/control | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 22f96625..17e81635 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,12 @@ llvm-toolchain-17 (1:17.0.0~+rc3-1~exp1) experimental; urgency=medium -- Sylvestre Ledru Tue, 22 Aug 2023 19:22:57 +0200 +llvm-toolchain-17 (1:17.0.0~+rc2-1~exp2) UNRELEASED; urgency=medium + + * debian/tests/control: update gcc to 10 => 13 + + -- Sylvestre Ledru Sat, 19 Aug 2023 10:07:19 +0200 + llvm-toolchain-17 (1:17.0.0~+rc2-1~exp1) experimental; urgency=medium * New snapshot release: diff --git a/debian/tests/control b/debian/tests/control index 1cff65f8..fd712f0f 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -7,7 +7,7 @@ Restrictions: allow-stderr Architecture: amd64 arm64 i386 Tests: integration-test-suite-test -Depends: @, cmake, make, g++, libstdc++-10-dev +Depends: @, cmake, make, g++, libstdc++-13-dev Restrictions: allow-stderr Architecture: amd64 arm64 From e0057b00ca8740d80748c3adf52dac2f06426b5a Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 5 Sep 2023 14:39:28 +0200 Subject: [PATCH 08/14] remove unsupported flags --- debian/rules | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/debian/rules b/debian/rules index 38f92b02..9278a8f1 100755 --- a/debian/rules +++ b/debian/rules @@ -816,6 +816,10 @@ build-wasm/compiler-rt-%: @echo "Building compiler-rt for $(cpu)" @echo "Using cmake: $(CMAKE_BIN)" mkdir -p "$@" +# remove unsupported flags + STAGE_2_CFLAGS=`echo $(STAGE_2_CFLAGS) | sed 's/-fcf-protection//g'` + STAGE_2_CXXFLAGS=`echo $(STAGE_2_CXXFLAGS) | sed 's/-fcf-protection//g'` + $(CMAKE_BIN) -B "$@" -S compiler-rt/lib/builtins/ \ -G Ninja \ $(SCCACHE_CMAKE) \ From b786bcc4b82e90c80c36b6f6fee2e113ae481ef3 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 6 Sep 2023 08:33:35 +0200 Subject: [PATCH 09/14] fix sed? --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/rules b/debian/rules index 9278a8f1..c8d2ef21 100755 --- a/debian/rules +++ b/debian/rules @@ -817,8 +817,8 @@ build-wasm/compiler-rt-%: @echo "Using cmake: $(CMAKE_BIN)" mkdir -p "$@" # remove unsupported flags - STAGE_2_CFLAGS=`echo $(STAGE_2_CFLAGS) | sed 's/-fcf-protection//g'` - STAGE_2_CXXFLAGS=`echo $(STAGE_2_CXXFLAGS) | sed 's/-fcf-protection//g'` + STAGE_2_CFLAGS=`echo $(STAGE_2_CFLAGS) | sed -e 's/-fcf-protection//g'` + STAGE_2_CXXFLAGS=`echo $(STAGE_2_CXXFLAGS) | sed -e 's/-fcf-protection//g'` $(CMAKE_BIN) -B "$@" -S compiler-rt/lib/builtins/ \ -G Ninja \ From 9e8860e7e3ec7c77b4f900574f41bcbdbaa61e37 Mon Sep 17 00:00:00 2001 From: Samuel Henrique Date: Wed, 6 Sep 2023 21:18:18 +0100 Subject: [PATCH 10/14] Explicitly depend on libcurl4-openssl-dev The same change was done to 16, we don't really need this for 17 but it's the relase team's strong recommendation that it should be done. --- debian/control | 2 +- debian/control.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 32437dc5..25cf3fef 100644 --- a/debian/control +++ b/debian/control @@ -26,7 +26,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, llvm-spirv-14 [ amd64 arm64 armel armhf mips64el mipsel ppc64el riscv64 s390x ] | hello [!i386], spirv-tools [ linux-any ] | hello [ !i386], wasi-libc | hello [ !any-i386], - libcurl4-dev, + 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], libprotobuf-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x], diff --git a/debian/control.in b/debian/control.in index fc183864..5ed74e57 100644 --- a/debian/control.in +++ b/debian/control.in @@ -26,7 +26,7 @@ Build-Depends: debhelper (>= 10.0), cmake, ninja-build, llvm-spirv-14 [ amd64 arm64 armel armhf mips64el mipsel ppc64el riscv64 s390x ] | hello [!i386], spirv-tools [ linux-any ] | hello [ !i386], wasi-libc | hello [ !any-i386], - libcurl4-dev, + 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], libprotobuf-dev [amd64 arm64 armel armhf mips64el mipsel ppc64 ppc64el powerpc riscv64 s390x], From 50df25a859164f81fdd9f9b8a8ecddd2e039dd78 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 3 Sep 2023 14:06:24 +0200 Subject: [PATCH 11/14] Disable python3-lldb on mips64el to unnreak the build --- debian/changelog | 8 ++++++-- debian/rules | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 17e81635..64ca808f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,14 @@ -llvm-toolchain-17 (1:17.0.0~+rc3-1~exp2) UNRELEASED; urgency=medium +llvm-toolchain-17 (1:17.0.0~+rc4-1~exp1) experimental; urgency=medium [ John Paul Adrian Glaubitz ] * Disable wasm support on powerpc and powerpcspe * Remove powerpc from BINUTILS_GOLD_ARCHS again - -- John Paul Adrian Glaubitz Wed, 30 Aug 2023 11:44:06 +0200 + [ Sylvestre Ledru ] + * new upstream release + * Disable python3-lldb on mips64el to unnreak the build + + -- Sylvestre Ledru Tue, 05 Sep 2023 14:42:18 +0200 llvm-toolchain-17 (1:17.0.0~+rc3-1~exp1) experimental; urgency=medium diff --git a/debian/rules b/debian/rules index c8d2ef21..b4d75d7a 100755 --- a/debian/rules +++ b/debian/rules @@ -1208,7 +1208,7 @@ endif # Disable the python binding for buster. not sure why it regressed # regressed de4364f1ecaa..0745b0c0354a - if test "$(DISTRO)" = "buster"; then \ + if test "$(DISTRO)" = "buster" -o "$(DISTRO)" = "bionic" -o "$(DEB_HOST_ARCH)" = "mips64el" then \ mkdir -p $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/gdb/python/ompd/; \ touch $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/gdb/python/ompd/empty; \ echo "" > debian/python3-lldb-$(LLVM_VERSION).install; \ From 8c67b5c9f52869a2ef31a9c091a4a9c437cccf5f Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 6 Sep 2023 22:44:48 +0200 Subject: [PATCH 12/14] Strip -fcf-protection for wasm build - new flag added in dpkg 1.22 --- debian/changelog | 6 ++++++ debian/rules | 12 ++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 64ca808f..8de618cd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-17 (1:17.0.0~+rc4-1~exp2) experimental; urgency=medium + + * Strip -fcf-protection for wasm build - new flag added in dpkg 1.22 + + -- Sylvestre Ledru Wed, 06 Sep 2023 22:44:15 +0200 + llvm-toolchain-17 (1:17.0.0~+rc4-1~exp1) experimental; urgency=medium [ John Paul Adrian Glaubitz ] diff --git a/debian/rules b/debian/rules index b4d75d7a..2626895e 100755 --- a/debian/rules +++ b/debian/rules @@ -811,15 +811,15 @@ ifndef LLVM_SPIRV endif touch $@ +# Remove some new flags introduced by dpkg 1.22.0; +STAGE_2_WASM_CFLAGS := $(shell echo $(STAGE_2_CFLAGS) | sed -e "s/-fcf-protection//g") +STAGE_2_WASM_CXXFLAGS := $(shell echo $(STAGE_2_CXXFLAGS) | sed -e "s/-fcf-protection//g") + build-wasm/compiler-rt-%: cpu = $(@:build-wasm/compiler-rt-%=%) build-wasm/compiler-rt-%: @echo "Building compiler-rt for $(cpu)" @echo "Using cmake: $(CMAKE_BIN)" mkdir -p "$@" -# remove unsupported flags - STAGE_2_CFLAGS=`echo $(STAGE_2_CFLAGS) | sed -e 's/-fcf-protection//g'` - STAGE_2_CXXFLAGS=`echo $(STAGE_2_CXXFLAGS) | sed -e 's/-fcf-protection//g'` - $(CMAKE_BIN) -B "$@" -S compiler-rt/lib/builtins/ \ -G Ninja \ $(SCCACHE_CMAKE) \ @@ -829,8 +829,8 @@ build-wasm/compiler-rt-%: -DCMAKE_ASM_COMPILER_TARGET=$(cpu)-unknown-unknown \ -DCMAKE_C_COMPILER=$(STAGE_2_BIN_DIR)/clang \ -DCMAKE_CXX_COMPILER=$(STAGE_2_BIN_DIR)/clang++ \ - -DCMAKE_C_FLAGS="$(opt_flags) $(STAGE_2_CFLAGS)" \ - -DCMAKE_CXX_FLAGS="$(opt_flags) $(STAGE_2_CXXFLAGS)" \ + -DCMAKE_C_FLAGS="$(opt_flags) $(STAGE_2_WASM_CFLAGS)" \ + -DCMAKE_CXX_FLAGS="$(opt_flags) $(STAGE_2_WASM_CXXFLAGS)" \ -DCMAKE_SHARED_LINKER_FLAGS="$(STAGE_2_LDFLAGS) -L$(STAGE_2_LIB_DIR)" \ -DCMAKE_MODULE_LINKER_FLAGS="$(STAGE_2_LDFLAGS) -L$(STAGE_2_LIB_DIR)" \ -DCMAKE_EXE_LINKER_FLAGS="$(STAGE_2_LDFLAGS) -L$(STAGE_2_LIB_DIR)" \ From f5a39a82c68e50ddb84db5eff5211553bb92d4b1 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 6 Sep 2023 23:05:16 +0200 Subject: [PATCH 13/14] improve the changelog --- debian/changelog | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 8de618cd..12b51302 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ llvm-toolchain-17 (1:17.0.0~+rc4-1~exp2) experimental; urgency=medium * Strip -fcf-protection for wasm build - new flag added in dpkg 1.22 + * Explicitly depend on libcurl4-openssl-dev + Thanks to Samuel Henrique for the fix -- Sylvestre Ledru Wed, 06 Sep 2023 22:44:15 +0200 @@ -12,7 +14,7 @@ llvm-toolchain-17 (1:17.0.0~+rc4-1~exp1) experimental; urgency=medium [ Sylvestre Ledru ] * new upstream release - * Disable python3-lldb on mips64el to unnreak the build + * Disable python3-lldb on mips64el to unbreak the build -- Sylvestre Ledru Tue, 05 Sep 2023 14:42:18 +0200 From 75890d4400ecee6c104015def6eefa4f875fd53c Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 7 Sep 2023 13:30:14 +0200 Subject: [PATCH 14/14] fix typo --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/rules b/debian/rules index 2626895e..c68935e9 100755 --- a/debian/rules +++ b/debian/rules @@ -1208,7 +1208,7 @@ endif # Disable the python binding for buster. not sure why it regressed # regressed de4364f1ecaa..0745b0c0354a - if test "$(DISTRO)" = "buster" -o "$(DISTRO)" = "bionic" -o "$(DEB_HOST_ARCH)" = "mips64el" then \ + if test "$(DISTRO)" = "buster" -o "$(DISTRO)" = "bionic" -o "$(DEB_HOST_ARCH)" = "mips64el"; then \ mkdir -p $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/gdb/python/ompd/; \ touch $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/gdb/python/ompd/empty; \ echo "" > debian/python3-lldb-$(LLVM_VERSION).install; \