From 1f7e69e458831ac9192568ce779bb8cde80d30c9 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 8 Feb 2022 21:40:25 +0100 Subject: [PATCH 1/3] Fix a typo in an header (closes: #1005195) --- debian/changelog | 6 ++++++ debian/patches/fix-typo.diff | 22 ++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 29 insertions(+) create mode 100644 debian/patches/fix-typo.diff diff --git a/debian/changelog b/debian/changelog index 25e5ba51..89535f77 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +llvm-toolchain-13 (1:13.0.1-3) UNRELEASED; urgency=medium + + * Fix a typo in an header (closes: #1005195) + + -- Sylvestre Ledru Tue, 08 Feb 2022 21:39:18 +0100 + llvm-toolchain-13 (1:13.0.1-2) unstable; urgency=medium * mlir: use the cmake option to avoid installing object files diff --git a/debian/patches/fix-typo.diff b/debian/patches/fix-typo.diff new file mode 100644 index 00000000..42ba97da --- /dev/null +++ b/debian/patches/fix-typo.diff @@ -0,0 +1,22 @@ +Index: llvm-toolchain-13-13.0.1/llvm/include/llvm/ADT/IntrusiveRefCntPtr.h +=================================================================== +--- llvm-toolchain-13-13.0.1.orig/llvm/include/llvm/ADT/IntrusiveRefCntPtr.h ++++ llvm-toolchain-13-13.0.1/llvm/include/llvm/ADT/IntrusiveRefCntPtr.h +@@ -79,7 +79,7 @@ protected: + #ifndef NDEBUG + ~RefCountedBase() { + assert(RefCount == 0 && +- "Destruction occured when there are still references to this."); ++ "Destruction occurred when there are still references to this."); + } + #else + // Default the destructor in release builds, A trivial destructor may enable +@@ -110,7 +110,7 @@ protected: + #ifndef NDEBUG + ~ThreadSafeRefCountedBase() { + assert(RefCount == 0 && +- "Destruction occured when there are still references to this."); ++ "Destruction occurred when there are still references to this."); + } + #else + // Default the destructor in release builds, A trivial destructor may enable diff --git a/debian/patches/series b/debian/patches/series index 8085eebd..083272b5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -152,3 +152,4 @@ compilerrt-builtins-arch-fix-armhf.diff compilerrt-build-scudo-standalone-option.diff use-gold-for-compiler-rt-when-set.diff wasm-ld-path.diff +fix-typo.diff From 5599d44854141c48bf3384bd0a7c5512ce62652f Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 13 Feb 2022 14:05:06 +0100 Subject: [PATCH 2/3] Also install usr/lib/llvm-@LLVM_VERSION@/lib/libRemoteIndexProto.a usr/lib/llvm-@LLVM_VERSION@/lib/libRemoteIndexServiceProto.a in libclang-X.Y-dev --- debian/changelog | 10 +++++++++- debian/libclang-X.Y-dev.install.in | 4 ++++ debian/rules | 3 --- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 03c3c6db..a82fed73 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,12 @@ -llvm-toolchain-12 (1:12.0.1-19) UNRELEASED; urgency=medium +llvm-toolchain-12 (1:12.0.1-20) unstable; urgency=medium + + * Also install usr/lib/llvm-@LLVM_VERSION@/lib/libRemoteIndexProto.a + usr/lib/llvm-@LLVM_VERSION@/lib/libRemoteIndexServiceProto.a + in libclang-X.Y-dev + + -- Sylvestre Ledru Sun, 13 Feb 2022 14:04:40 +0100 + +llvm-toolchain-12 (1:12.0.1-19) unstable; urgency=medium * Build clangd with GRPC support Thanks to Sam McCall for the patch diff --git a/debian/libclang-X.Y-dev.install.in b/debian/libclang-X.Y-dev.install.in index b967aff8..6bd7a385 100644 --- a/debian/libclang-X.Y-dev.install.in +++ b/debian/libclang-X.Y-dev.install.in @@ -5,3 +5,7 @@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang*a usr/lib/llvm-@LLVM_VERSION@/lib/libclang.so usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@*.so usr/lib/llvm-@LLVM_VERSION@/lib/libfindAllSymbols.a + +# clangd +usr/lib/llvm-@LLVM_VERSION@/lib/libRemoteIndexProto.a +usr/lib/llvm-@LLVM_VERSION@/lib/libRemoteIndexServiceProto.a diff --git a/debian/rules b/debian/rules index 980d0cad..5a325b6c 100755 --- a/debian/rules +++ b/debian/rules @@ -695,9 +695,6 @@ override_dh_auto_install: # Remove an example - introduced in https://reviews.llvm.org/D61446 rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libBye.a - # Remove unused clangd lib - rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libRemoteIndexProto.a $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libRemoteIndexServiceProto.a - cp $(TARGET_BUILD_STAGE2)/bin/clang-query $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin # Only run on executable, not script From fc598bed7c2ce65d345334de24e2de15422f8a4f Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 13 Feb 2022 14:08:28 +0100 Subject: [PATCH 3/3] Also install usr/lib/llvm-@LLVM_VERSION@/lib/libRemoteIndexProto.a usr/lib/llvm-@LLVM_VERSION@/lib/libRemoteIndexServiceProto.a usr/lib/llvm-@LLVM_VERSION@/lib/libMonitoringServiceProto.a in libclang-X.Y-dev (Closes: #1005666) --- debian/changelog | 8 +++++++- debian/libclang-X.Y-dev.install.in | 1 + debian/rules | 6 ------ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 17d6e300..5d2f3054 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,13 @@ -llvm-toolchain-13 (1:13.0.1-3) UNRELEASED; urgency=medium +llvm-toolchain-13 (1:13.0.1-3) unstable; urgency=medium * Fix a typo in an header (closes: #1005195) + * Also install usr/lib/llvm-@LLVM_VERSION@/lib/libRemoteIndexProto.a + usr/lib/llvm-@LLVM_VERSION@/lib/libRemoteIndexServiceProto.a + usr/lib/llvm-@LLVM_VERSION@/lib/libMonitoringServiceProto.a + in libclang-X.Y-dev + (Closes: #1005666) + -- Sylvestre Ledru Tue, 08 Feb 2022 21:39:18 +0100 llvm-toolchain-13 (1:13.0.1-2) unstable; urgency=medium diff --git a/debian/libclang-X.Y-dev.install.in b/debian/libclang-X.Y-dev.install.in index 6bd7a385..e4639c80 100644 --- a/debian/libclang-X.Y-dev.install.in +++ b/debian/libclang-X.Y-dev.install.in @@ -9,3 +9,4 @@ usr/lib/llvm-@LLVM_VERSION@/lib/libfindAllSymbols.a # clangd usr/lib/llvm-@LLVM_VERSION@/lib/libRemoteIndexProto.a usr/lib/llvm-@LLVM_VERSION@/lib/libRemoteIndexServiceProto.a +usr/lib/llvm-@LLVM_VERSION@/lib/libMonitoringServiceProto.a diff --git a/debian/rules b/debian/rules index 73fbba12..110bcad9 100755 --- a/debian/rules +++ b/debian/rules @@ -705,12 +705,6 @@ override_dh_auto_install: # Remove an example - introduced in https://reviews.llvm.org/D61446 rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libBye.a -<<<<<<< HEAD - # Remove unused clangd lib - rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libRemoteIndexProto.a $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libRemoteIndexServiceProto.a $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libMonitoringServiceProto.a - -======= ->>>>>>> origin/12 cp $(TARGET_BUILD_STAGE2)/bin/clang-query $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin # Only run on executable, not script