From 54cd0ab0e50ab31e1bf0656a4142787c742b4f4a Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Tue, 27 Jun 2023 08:55:19 +0200 Subject: [PATCH 01/19] Revert "Adjust LIBCXXABI_ARM_EHABI => _LIBCXXABI_ARM_EHABI Issue: https://github.com/llvm/llvm-project/issues/59240" This reverts commit 20ff92c9829b28c34e434da22738a8420164c132. --- debian/changelog | 4 +--- debian/patches/libcxx/libcxxabi-arm-ehabi-fix.patch | 10 +++++----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 82f7b4d5..b0341613 100644 --- a/debian/changelog +++ b/debian/changelog @@ -247,10 +247,8 @@ llvm-toolchain-15 (1:15.0.7-5~exp1) experimental; urgency=medium * Remove old code to manage Debian stretch * Force the replacement of new Ubuntu packages introduced in https://bugs.launchpad.net/ubuntu/+source/llvm-toolchain-15/+bug/2008755 - * Adjust LIBCXXABI_ARM_EHABI => _LIBCXXABI_ARM_EHABI - Issue: https://github.com/llvm/llvm-project/issues/59240 - -- Sylvestre Ledru Sun, 04 Jun 2023 11:35:54 +0200 + -- llvm-toolchain-15 (1:15.0.7-4) unstable; urgency=medium diff --git a/debian/patches/libcxx/libcxxabi-arm-ehabi-fix.patch b/debian/patches/libcxx/libcxxabi-arm-ehabi-fix.patch index 23351802..fa5d859c 100644 --- a/debian/patches/libcxx/libcxxabi-arm-ehabi-fix.patch +++ b/debian/patches/libcxx/libcxxabi-arm-ehabi-fix.patch @@ -16,7 +16,7 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxxabi/src/cx #ifdef __USING_SJLJ_EXCEPTIONS__ _Unwind_SjLj_RaiseException(&exception_header->unwindHeader); -#else -+#elif !_LIBCXXABI_ARM_EHABI ++#elif !LIBCXXABI_ARM_EHABI _Unwind_RaiseException(&exception_header->unwindHeader); +#else + _Unwind_RaiseException(exception_header->unwindHeader); @@ -34,7 +34,7 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxxabi/src/cx // to touch a foreign exception in any way, that is undefined // behavior. They likely can't since the only way to catch // a foreign exception is with catch (...)! -+#if !_LIBCXXABI_ARM_EHABI ++#if !LIBCXXABI_ARM_EHABI _Unwind_DeleteException(&globals->caughtExceptions->unwindHeader); +#else + _Unwind_DeleteException(globals->caughtExceptions->unwindHeader); @@ -47,7 +47,7 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxxabi/src/cx #ifdef __USING_SJLJ_EXCEPTIONS__ _Unwind_SjLj_RaiseException(&exception_header->unwindHeader); -#else -+#elif !_LIBCXXABI_ARM_EHABI ++#elif !LIBCXXABI_ARM_EHABI _Unwind_RaiseException(&exception_header->unwindHeader); +#else + _Unwind_RaiseException(exception_header->unwindHeader); @@ -58,7 +58,7 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxxabi/src/cx dep_exception_header->unwindHeader.exception_cleanup = dependent_exception_cleanup; #ifdef __USING_SJLJ_EXCEPTIONS__ _Unwind_SjLj_RaiseException(&dep_exception_header->unwindHeader); -+#elif !_LIBCXXABI_ARM_EHABI ++#elif !LIBCXXABI_ARM_EHABI + _Unwind_RaiseException(&dep_exception_header->unwindHeader); #else - _Unwind_RaiseException(&dep_exception_header->unwindHeader); @@ -74,7 +74,7 @@ Index: llvm-toolchain-snapshot_16~++20220920091612+a7d2409bac7f/libcxxabi/src/cx _LIBCXXABI_HIDDEN void __setExceptionClass ( _Unwind_Exception*, uint64_t); _LIBCXXABI_HIDDEN bool __isOurExceptionClass(const _Unwind_Exception*); -+#if _LIBCXXABI_ARM_EHABI ++#if LIBCXXABI_ARM_EHABI +// GCC has _Unwind_Control_Block in unwind.h (unwind_arm_common.h) +#if defined(__clang__) +struct _Unwind_Control_Block From fe89d79f9dbf8b597e596815ee9b582eb1afe926 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Tue, 27 Jun 2023 10:15:32 +0200 Subject: [PATCH 02/19] Revert * Adjust LIBCXXABI_ARM_EHABI => _LIBCXXABI_ARM_EHABI Issue: https://github.com/llvm/llvm-project/issues/59240 --- debian/changelog | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index b0341613..3789fd12 100644 --- a/debian/changelog +++ b/debian/changelog @@ -213,10 +213,16 @@ llvm-toolchain-snapshot (1:16~++20220731055325+02b3a358926e-1~exp1) experimental -- Sylvestre Ledru Wed, 27 Jul 2022 21:36:27 +0200 -llvm-toolchain-15 (1:15.0.7-6) UNRELEASED; urgency=medium +llvm-toolchain-15 (1:15.0.7-6) unstable; urgency=medium + + [ Sylvestre Ledru ] * Only pass -Bno-symbolic if it exists + [ Gianfranco Costamagna ] + * Revert LIBCXXABI_ARM_EHABI => _LIBCXXABI_ARM_EHABI change, + FTBFS on arm*. + -- Sylvestre Ledru Mon, 26 Jun 2023 10:13:40 +0200 llvm-toolchain-15 (1:15.0.7-5) unstable; urgency=medium @@ -247,8 +253,10 @@ llvm-toolchain-15 (1:15.0.7-5~exp1) experimental; urgency=medium * Remove old code to manage Debian stretch * Force the replacement of new Ubuntu packages introduced in https://bugs.launchpad.net/ubuntu/+source/llvm-toolchain-15/+bug/2008755 + * Adjust LIBCXXABI_ARM_EHABI => _LIBCXXABI_ARM_EHABI + Issue: https://github.com/llvm/llvm-project/issues/59240 - -- + -- Sylvestre Ledru Sun, 04 Jun 2023 11:35:54 +0200 llvm-toolchain-15 (1:15.0.7-4) unstable; urgency=medium From 7f997318d48a347645d27b3137a8d501ab8d057c Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Tue, 27 Jun 2023 08:59:00 +0200 Subject: [PATCH 03/19] Update changelog --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 3789fd12..f7bbf6e1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +llvm-toolchain-16 (1:16.0.6-3) unstable; urgency=medium + + * Revert LIBCXXABI_ARM_EHABI => _LIBCXXABI_ARM_EHABI change, + FTBFS on arm*. + + -- Gianfranco Costamagna Tue, 27 Jun 2023 08:58:16 +0200 + llvm-toolchain-16 (1:16.0.6-2) unstable; urgency=medium * Remove debian/NEWS to fix debian-news-entry-has-unknown-version From 89e81f4d5c90406545247c58a8d44a3ac866d8ad Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Tue, 27 Jun 2023 10:16:45 +0200 Subject: [PATCH 04/19] Fixup merge --- debian/changelog | 1 - debian/rules | 5 ----- 2 files changed, 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index f7bbf6e1..01ef3657 100644 --- a/debian/changelog +++ b/debian/changelog @@ -220,7 +220,6 @@ llvm-toolchain-snapshot (1:16~++20220731055325+02b3a358926e-1~exp1) experimental -- Sylvestre Ledru Wed, 27 Jul 2022 21:36:27 +0200 - llvm-toolchain-15 (1:15.0.7-6) unstable; urgency=medium [ Sylvestre Ledru ] diff --git a/debian/rules b/debian/rules index cc7732bc..c73c8744 100755 --- a/debian/rules +++ b/debian/rules @@ -181,11 +181,6 @@ ifneq (,$(filter $(DEB_HOST_ARCH),i386)) CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=i386-linux-gnu endif -ifneq (,$(filter $(DEB_HOST_ARCH),i386)) -# Sometimes, i386 needs help with the triple - CMAKE_EXTRA += -DLLVM_HOST_TRIPLE=i386-linux-gnu -endif - ifneq (,$(filter $(DEB_HOST_ARCH),mips64el)) # avoid an issue with search path on mips64el # https://bugs.llvm.org/show_bug.cgi?id=41204 From 450b1fb25a62bd6bb66fb60e0ce526ff6a5d4c70 Mon Sep 17 00:00:00 2001 From: Gianfranco Costamagna Date: Tue, 27 Jun 2023 10:17:13 +0200 Subject: [PATCH 05/19] Update changelog --- debian/changelog | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/debian/changelog b/debian/changelog index 01ef3657..6faa1d56 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,9 @@ llvm-toolchain-16 (1:16.0.6-3) unstable; urgency=medium + [ Sylvestre Ledru ] + * Only pass -Bno-symbolic if it exists + + [ Gianfranco Costamagna ] * Revert LIBCXXABI_ARM_EHABI => _LIBCXXABI_ARM_EHABI change, FTBFS on arm*. From bcc2dd149d6ba4dee0c7a86eb74bf2a8e7e214c4 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 26 Jun 2023 17:50:52 +0200 Subject: [PATCH 06/19] lldb-16: lldb no longer depend on llvm-dev (Closes: #1039490) --- debian/changelog | 4 ++++ debian/control | 2 +- debian/control.in | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6faa1d56..2698d398 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,15 @@ llvm-toolchain-16 (1:16.0.6-3) unstable; urgency=medium +<<<<<<< [ Sylvestre Ledru ] * Only pass -Bno-symbolic if it exists [ Gianfranco Costamagna ] * Revert LIBCXXABI_ARM_EHABI => _LIBCXXABI_ARM_EHABI change, FTBFS on arm*. +======= + * lldb-16: lldb no longer depend on llvm-dev (Closes: #1039490) +>>>>>>> -- Gianfranco Costamagna Tue, 27 Jun 2023 08:58:16 +0200 diff --git a/debian/control b/debian/control index b44a54b9..013d43cb 100644 --- a/debian/control +++ b/debian/control @@ -562,7 +562,7 @@ Description: LLVM-based linker, header files Package: lldb-16 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}, libllvm16 (= ${binary:Version}), llvm-16-dev, +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm16 (= ${binary:Version}), python3-lldb-16 Pre-Depends: ${misc:Pre-Depends} Description: Next generation, high-performance debugger diff --git a/debian/control.in b/debian/control.in index 1c5918d2..319558d9 100644 --- a/debian/control.in +++ b/debian/control.in @@ -562,7 +562,7 @@ Description: LLVM-based linker, header files Package: lldb-@LLVM_VERSION@ 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}, libllvm@LLVM_VERSION@ (= ${binary:Version}), llvm-@LLVM_VERSION@-dev, +Depends: ${shlibs:Depends}, ${misc:Depends}, libllvm@LLVM_VERSION@ (= ${binary:Version}), python3-lldb-@LLVM_VERSION@ Pre-Depends: ${misc:Pre-Depends} Description: Next generation, high-performance debugger From 0536df8c03e988fe229659ae0540d86749212deb Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 29 Jun 2023 16:12:48 +0200 Subject: [PATCH 07/19] lldb-16: lldb no longer depend on llvm-dev (Closes: #1039490) --- debian/changelog | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2698d398..98d83bcc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,15 +1,17 @@ +llvm-toolchain-16 (1:16.0.6-4) UNRELEASED; urgency=medium + + * lldb-16: lldb no longer depend on llvm-dev (Closes: #1039490) + + -- Sylvestre Ledru Thu, 29 Jun 2023 16:12:39 +0200 + llvm-toolchain-16 (1:16.0.6-3) unstable; urgency=medium -<<<<<<< [ Sylvestre Ledru ] * Only pass -Bno-symbolic if it exists [ Gianfranco Costamagna ] * Revert LIBCXXABI_ARM_EHABI => _LIBCXXABI_ARM_EHABI change, FTBFS on arm*. -======= - * lldb-16: lldb no longer depend on llvm-dev (Closes: #1039490) ->>>>>>> -- Gianfranco Costamagna Tue, 27 Jun 2023 08:58:16 +0200 From 36a4128892b91cde4eb22853746f1496634761e1 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 4 Jul 2023 14:42:25 +0200 Subject: [PATCH 08/19] check more symlink --- debian/qualify-clang.sh | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index 11eda2be..a4a49384 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -477,8 +477,19 @@ if ! ldd o 2>&1|grep -q libclang-cpp; then fi ./o > /dev/null -# Check that the symlink is correct -ls -al /usr/lib/llvm-$VERSION/lib/libclang-cpp.so.$VERSION > /dev/null +check_symlink() { + P="/usr/lib/llvm-$VERSION/lib/$1" + if test ! -e $P; then + echo "invalid symlink $P" + ls -al $P + exit 1 + fi +} + +check_symlink "libclang-cpp.so.$VERSION" +check_symlink "libclang-$VERSION.so" +check_symlink "libclang.so" + echo "Testing code coverage ..." From 704c661aa12133c1fd7ed38cf1554d6d6d101a7b Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 6 Jul 2023 17:07:59 +0200 Subject: [PATCH 09/19] Remove old workaround - it was for 13 --- debian/rules | 9 --------- 1 file changed, 9 deletions(-) diff --git a/debian/rules b/debian/rules index c73c8744..77bb9f7d 100755 --- a/debian/rules +++ b/debian/rules @@ -535,15 +535,6 @@ preconfigure: debian/llvm-$(LLVM_VERSION)-linker-tools.links \ debian/libbolt-$(LLVM_VERSION)-dev.install - # workaround the breaks/replaces/conflicts introduced with the omp-device-info move - # we update the version to make it work with apt.llvm.org - # Yeah, this is ugly but I don't know how to do better - if test "$(LLVM_VERSION)" = "13"; then \ - if echo "$(LLVM_VERSION_SNAPSHOT)"|grep -q "++"; then \ - sed -i -e "s|(<< 1:13.0.0-4)|(<< 1:13.0.0~++20211013044936)|g" debian/control; \ - fi; \ - fi - # workaround the breaks/replaces/conflicts # https://bugs.launchpad.net/ubuntu/+source/llvm-toolchain-15/+bug/2008755 # Yeah, this is ugly but I don't know how to do better From 6e018f1f5248d041d64819f894340c013276e2e4 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 6 Jul 2023 17:08:43 +0200 Subject: [PATCH 10/19] remove old workaround - it was for 15 --- debian/rules | 9 --------- 1 file changed, 9 deletions(-) diff --git a/debian/rules b/debian/rules index 77bb9f7d..f2916236 100755 --- a/debian/rules +++ b/debian/rules @@ -535,15 +535,6 @@ preconfigure: debian/llvm-$(LLVM_VERSION)-linker-tools.links \ debian/libbolt-$(LLVM_VERSION)-dev.install - # workaround the breaks/replaces/conflicts - # https://bugs.launchpad.net/ubuntu/+source/llvm-toolchain-15/+bug/2008755 - # Yeah, this is ugly but I don't know how to do better - if test "$(DISTRO)" = "jammy" -o "$(DISTRO)" = "kinetic" -o "$(DISTRO)" = "focal"; then \ - if test "$(LLVM_VERSION)" = "15"; then \ - sed -i -e "s|libclang-common-15-dev (<< 1:15.0.6-5)|libclang-common-15-dev (<< 1:15.0.6-5), libclang-common-15-dev (= 1:15.0.7-0ubuntu0.22.04.1), libpolly-15-dev (= 1:15.0.7-0ubuntu0.22.04.1)|g" debian/control; \ - fi; \ - fi - ifdef LLVM_SPIRV # llvm-spirv was found, so we can enable *.spv files. Debian # buster and Ubuntu 18.04 don't have llvm-spirv to create the From c295e5d70b329d12adf37030439a6e683d6b67d4 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 6 Jul 2023 17:17:30 +0200 Subject: [PATCH 11/19] Fix the libclang symlink issue document recent changes --- debian/changelog | 4 +++- debian/rules | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 98d83bcc..3d21c6fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,10 @@ llvm-toolchain-16 (1:16.0.6-4) UNRELEASED; urgency=medium * lldb-16: lldb no longer depend on llvm-dev (Closes: #1039490) + * Unbreak the libclang links (Closes: #1040205) + And add tests to make sure we don't regress - -- Sylvestre Ledru Thu, 29 Jun 2023 16:12:39 +0200 + -- Sylvestre Ledru Thu, 06 Jul 2023 17:12:40 +0200 llvm-toolchain-16 (1:16.0.6-3) unstable; urgency=medium diff --git a/debian/rules b/debian/rules index f2916236..9ab61452 100755 --- a/debian/rules +++ b/debian/rules @@ -997,8 +997,8 @@ endif : # libclang cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/ && \ - ln -s libclang-$(LLVM_VERSION).so.$(LLVM_VERSION) libclang.so.$(SONAME_EXT) && \ - ln -s libclang-$(LLVM_VERSION).so.$(LLVM_VERSION) libclang-$(LLVM_VERSION).so.$(SONAME_EXT) + ln -s libclang-$(LLVM_VERSION).so.$(FULL_LLVM_VERSION) libclang.so.$(SONAME_EXT) && \ + ln -s libclang-$(LLVM_VERSION).so.$(FULL_LLVM_VERSION) libclang-$(LLVM_VERSION).so.$(SONAME_EXT) if test "$(LIBUNWIND_ENABLE)" = yes; then \ mkdir -p debian/tmp/usr/include/libunwind; \ From 997fe7a790f676edb6d21fcc6539a17a0318609f Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 6 Jul 2023 17:20:32 +0200 Subject: [PATCH 12/19] add the check --- debian/qualify-clang.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index a4a49384..12ff0461 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -490,6 +490,10 @@ check_symlink "libclang-cpp.so.$VERSION" check_symlink "libclang-$VERSION.so" check_symlink "libclang.so" +echo "Testing python clang ..." + +python3 -c 'from ctypes import *; import clang.cindex; config = clang.cindex.Config(); verfunc = config.lib.clang_getClangVersion; verfunc.restype = c_char_p ; print(verfunc())' + echo "Testing code coverage ..." From d06b6ff2fd644d590976610f7da683de22865b28 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 6 Jul 2023 17:41:46 +0200 Subject: [PATCH 13/19] fix some typos --- debian/changelog | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3d21c6fd..9e15e597 100644 --- a/debian/changelog +++ b/debian/changelog @@ -261,7 +261,7 @@ llvm-toolchain-15 (1:15.0.7-5) unstable; urgency=medium llvm-toolchain-15 (1:15.0.7-5~exp2) experimental; urgency=medium - * Also apply the workround of issue #62621 for focal + * Also apply the workaround of issue #62621 for focal and to include libpolly-15-dev -- Sylvestre Ledru Sat, 10 Jun 2023 11:52:14 +0200 @@ -365,7 +365,7 @@ llvm-toolchain-15 (1:15.0.6-5~exp1) experimental; urgency=medium $ apt install clang-15 lld-15 libclang-rt-15-dev-wasm32 wasi-libc $ clang-15 --target=wasm32-wasi helloworld.c -o helloworld.wasm Many thanks to Faidon Liambotis - * libclang-common-15-dev splitted into different packages: + * libclang-common-15-dev split into different packages: - libclang-rt-15-dev - libpolly-15-dev - libclang-rt-15-dev-wasm32 @@ -422,7 +422,7 @@ llvm-toolchain-15 (1:15.0.5-2) unstable; urgency=medium [ Gianfranco Costamagna ] * Add libomp target library to mips64el (Closes: #1023101) - * Explictly depend on spirv-14 for mips64el, to ease bootstrapping + * Explicitly depend on spirv-14 for mips64el, to ease bootstrapping on buildds (this should be dropped once we build a spirv-15 in archive) * Cherry-pick two upstream patches to unblock mesa build on arm* (Closes: #1022577) @@ -4292,7 +4292,7 @@ llvm-toolchain-7 (1:7-6~exp1) experimental; urgency=medium opt-viewer.py needs it * Add back libomp5-X.Y.symbols.in (untested) * Fix the install of clang bash completion - * Start the work on bootstraping clang + * Start the work on bootstrapping clang - bootstrap-with-openmp-version-export-missing.diff: fix a link issue https://bugs.llvm.org/show_bug.cgi?id=39200 - bootstrap-fix-include-next.diff: Fix an include issue at bootstrap phase From e2e888fcc573a3ffa53bf2705b6f3bad8de56c3f Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 8 Jul 2023 20:46:34 +0200 Subject: [PATCH 14/19] fix the clang 16 symlink --- debian/libclang-X.Y-dev.links.in | 6 +++--- debian/libclang1-X.Y.install.in | 1 - 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/debian/libclang-X.Y-dev.links.in b/debian/libclang-X.Y-dev.links.in index 7cd10c4d..a82e6089 100644 --- a/debian/libclang-X.Y-dev.links.in +++ b/debian/libclang-X.Y-dev.links.in @@ -1,3 +1,3 @@ -usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so -usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang.so -usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so +usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION_FULL@ usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so +usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION_FULL@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang.so +usr/lib/@DEB_HOST_MULTIARCH@/libclang-@LLVM_VERSION@.so.@LLVM_VERSION_FULL@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so diff --git a/debian/libclang1-X.Y.install.in b/debian/libclang1-X.Y.install.in index b197f9ad..a707d1d1 100644 --- a/debian/libclang1-X.Y.install.in +++ b/debian/libclang1-X.Y.install.in @@ -1,2 +1 @@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.1* /usr/lib/@DEB_HOST_MULTIARCH@/ -usr/lib/llvm-@LLVM_VERSION@/lib/libclang.so.1 From 24f7c47528d81c31848c83a2170cad002580a9c9 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 9 Jul 2023 15:09:24 +0200 Subject: [PATCH 15/19] Fix the libclang-16.so symbol file --- debian/changelog | 5 +++-- debian/libclang1-X.Y.symbols.in | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9e15e597..841b435d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,11 @@ -llvm-toolchain-16 (1:16.0.6-4) UNRELEASED; urgency=medium +llvm-toolchain-16 (1:16.0.6-5) UNRELEASED; urgency=medium * lldb-16: lldb no longer depend on llvm-dev (Closes: #1039490) * Unbreak the libclang links (Closes: #1040205) And add tests to make sure we don't regress + * Fix the libclang-16.so symbol file - -- Sylvestre Ledru Thu, 06 Jul 2023 17:12:40 +0200 + -- Sylvestre Ledru Sun, 09 Jul 2023 15:08:24 +0200 llvm-toolchain-16 (1:16.0.6-3) unstable; urgency=medium diff --git a/debian/libclang1-X.Y.symbols.in b/debian/libclang1-X.Y.symbols.in index 16a7ec27..9d6e9d20 100644 --- a/debian/libclang1-X.Y.symbols.in +++ b/debian/libclang1-X.Y.symbols.in @@ -1,4 +1,4 @@ -libclang-@LLVM_VERSION@.so.@LLVM_VERSION@ libclang1-@LLVM_VERSION@ #MINVER# +libclang-@LLVM_VERSION@.so.@LLVM_VERSION_FULL@ libclang1-@LLVM_VERSION@ #MINVER# (optional)LLVM_13@LLVM_13 1:15.0.7-3 (optional)LLVM_16@LLVM_16 1:16.0.2-1 clang_BlockCommandComment_getArgText@LLVM_13 1:5.0~svn298832-1~ From f3da7b1122f1f1698dd6dcf20f36296e8e0f4ac4 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 9 Jul 2023 15:22:55 +0200 Subject: [PATCH 16/19] Remove broken symlinks (closes: #857680) --- debian/changelog | 1 + debian/llvm-X.Y-examples.links.in | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) delete mode 100644 debian/llvm-X.Y-examples.links.in diff --git a/debian/changelog b/debian/changelog index 841b435d..d51f3528 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ llvm-toolchain-16 (1:16.0.6-5) UNRELEASED; urgency=medium * Unbreak the libclang links (Closes: #1040205) And add tests to make sure we don't regress * Fix the libclang-16.so symbol file + * Remove broken symlinks (closes: #857680) -- Sylvestre Ledru Sun, 09 Jul 2023 15:08:24 +0200 diff --git a/debian/llvm-X.Y-examples.links.in b/debian/llvm-X.Y-examples.links.in deleted file mode 100644 index a8d74aa2..00000000 --- a/debian/llvm-X.Y-examples.links.in +++ /dev/null @@ -1,3 +0,0 @@ -/usr/lib/llvm-@LLVM_VERSION@/build/Makefile.common usr/share/doc/llvm-@LLVM_VERSION@-examples/Makefile.common -/usr/lib/llvm-@LLVM_VERSION@/build/Makefile.config usr/share/doc/llvm-@LLVM_VERSION@-examples/Makefile.config -/usr/lib/llvm-@LLVM_VERSION@/build/Makefile.rules usr/share/doc/llvm-@LLVM_VERSION@-examples/Makefile.rules From 9b720e0ef9ba60259a562b99bb2065d9af55bbdd Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 9 Jul 2023 15:25:06 +0200 Subject: [PATCH 17/19] remove old way of doing symlink --- debian/rules | 5 ----- 1 file changed, 5 deletions(-) diff --git a/debian/rules b/debian/rules index 9ab61452..57f4a26d 100755 --- a/debian/rules +++ b/debian/rules @@ -995,11 +995,6 @@ ifneq (,$(filter $(DEB_HOST_ARCH_OS),linux)) endif endif - : # libclang - cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/ && \ - ln -s libclang-$(LLVM_VERSION).so.$(FULL_LLVM_VERSION) libclang.so.$(SONAME_EXT) && \ - ln -s libclang-$(LLVM_VERSION).so.$(FULL_LLVM_VERSION) libclang-$(LLVM_VERSION).so.$(SONAME_EXT) - if test "$(LIBUNWIND_ENABLE)" = yes; then \ mkdir -p debian/tmp/usr/include/libunwind; \ cp -R libunwind/include/* debian/tmp/usr/include/libunwind/; \ From 91d292bd676a913ea5161958a2e43a87f8448311 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 9 Jul 2023 15:30:47 +0200 Subject: [PATCH 18/19] prepare release --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d51f3528..a2833d88 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -llvm-toolchain-16 (1:16.0.6-5) UNRELEASED; urgency=medium +llvm-toolchain-16 (1:16.0.6-4) unstable; urgency=medium * lldb-16: lldb no longer depend on llvm-dev (Closes: #1039490) * Unbreak the libclang links (Closes: #1040205) From a6bdc649127beeabc18c98825a671cc3242c8f6c Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Tue, 31 Jan 2023 10:38:56 +0100 Subject: [PATCH 19/19] Fix hurd build by fixing Linux-specific lines --- debian/changelog | 7 +++++++ debian/libclang-rt-X.Y-dev.install.in | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index a2833d88..6dbf907a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +llvm-toolchain-16 (1:16.0.6-5) UNRELEASED; urgency=medium + + [ Samuel Thibault ] + * Fix hurd build by fixing Linux-specific lines. + + -- Samuel Thibault Sun, 09 Jul 2023 17:03:24 +0200 + llvm-toolchain-16 (1:16.0.6-4) unstable; urgency=medium * lldb-16: lldb no longer depend on llvm-dev (Closes: #1039490) diff --git a/debian/libclang-rt-X.Y-dev.install.in b/debian/libclang-rt-X.Y-dev.install.in index 786f4c65..6864ec82 100644 --- a/debian/libclang-rt-X.Y-dev.install.in +++ b/debian/libclang-rt-X.Y-dev.install.in @@ -2,7 +2,7 @@ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/share/*.txt usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/include/sanitizer/ -usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/lib/linux/*clang_rt* +usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION@*/lib/*/*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