From a4c9068ec6a28cf63d411a1b9c99674d513ac374 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 2 Sep 2019 16:53:05 +0200 Subject: [PATCH 1/5] remove a file which should not be installed --- debian/libclang-cppX.Y.install.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/libclang-cppX.Y.install.in b/debian/libclang-cppX.Y.install.in index 9edfbeff..75113642 100644 --- a/debian/libclang-cppX.Y.install.in +++ b/debian/libclang-cppX.Y.install.in @@ -1,3 +1,3 @@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/ usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so.1 -usr/lib/llvm-9/lib/libclang-cpp.so.@LLVM_VERSION@ + From a0dfd37191f44fee26177cba722922f4132b14f0 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 3 Sep 2019 08:11:42 +0200 Subject: [PATCH 2/5] fix links --- debian/libclang-cppX.Y.links.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/debian/libclang-cppX.Y.links.in b/debian/libclang-cppX.Y.links.in index 4f534bd0..d566c832 100644 --- a/debian/libclang-cppX.Y.links.in +++ b/debian/libclang-cppX.Y.links.in @@ -1,2 +1,3 @@ -/usr/lib/@DEB_HOST_MULTIARCH@/libclang-cpp.so.@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so.@LLVM_VERSION@ -/usr/lib/@DEB_HOST_MULTIARCH@/libclang-cpp.so.@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so.1 +/usr/lib/@DEB_HOST_MULTIARCH@/libclang-cpp-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so.@LLVM_VERSION@ +/usr/lib/@DEB_HOST_MULTIARCH@/libclang-cpp-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so.1 +/usr/lib/@DEB_HOST_MULTIARCH@/libclang-cpp-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libclang-cpp.so.@LLVM_VERSION@ From 5846370e55831fbe4edbfef0934c7e0b3ccf7c2d Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 3 Sep 2019 08:11:53 +0200 Subject: [PATCH 3/5] improve the tests --- debian/qualify-clang.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh index 137b3795..6f31b1e8 100755 --- a/debian/qualify-clang.sh +++ b/debian/qualify-clang.sh @@ -169,6 +169,10 @@ if ! ldd o 2>&1|grep -q libclang-cpp; then echo "Didn't link against libclang-cpp$VERSION" exit 42 fi +./o > /dev/null + +# Check that the symlink is correct +ls -al /usr/lib/llvm-$VERSION/lib/libclang-cpp.so.1 > /dev/null echo "Testing code coverage ..." From 9b69c89f47a78e1d2ccc4b92299848bd8fe5ee8d Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 4 Sep 2019 18:46:11 +0200 Subject: [PATCH 4/5] try to fix the link --- debian/libclang-cppX.Y.install.in | 1 - debian/libclang-cppX.Y.links.in | 1 - debian/rules | 4 ++-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/debian/libclang-cppX.Y.install.in b/debian/libclang-cppX.Y.install.in index 75113642..25c578ee 100644 --- a/debian/libclang-cppX.Y.install.in +++ b/debian/libclang-cppX.Y.install.in @@ -1,3 +1,2 @@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/ usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so.1 - diff --git a/debian/libclang-cppX.Y.links.in b/debian/libclang-cppX.Y.links.in index d566c832..6d3ef536 100644 --- a/debian/libclang-cppX.Y.links.in +++ b/debian/libclang-cppX.Y.links.in @@ -1,3 +1,2 @@ /usr/lib/@DEB_HOST_MULTIARCH@/libclang-cpp-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so.@LLVM_VERSION@ /usr/lib/@DEB_HOST_MULTIARCH@/libclang-cpp-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so.1 -/usr/lib/@DEB_HOST_MULTIARCH@/libclang-cpp-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libclang-cpp.so.@LLVM_VERSION@ diff --git a/debian/rules b/debian/rules index e6a5ac9e..7a9612fa 100755 --- a/debian/rules +++ b/debian/rules @@ -577,8 +577,8 @@ override_dh_auto_install: ln -s libclang-$(LLVM_VERSION).so.$(SONAME_EXT) libclang.so.$(SONAME_EXT) cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/ && mv libclang-cpp.so.$(LLVM_VERSION) libclang-cpp-$(LLVM_VERSION).so.$(SONAME_EXT); \ - ln -s libclang-cpp-$(LLVM_VERSION).so.$(SONAME_EXT) libclang-cpp.so.$(SONAME_EXT) - + ln -s libclang-cpp-$(LLVM_VERSION).so.$(SONAME_EXT) libclang-cpp.so.$(SONAME_EXT); \ + ln -s libclang-cpp-$(LLVM_VERSION).so.$(SONAME_EXT)libclang-cpp.so.$(LLVM_VERSION) cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib && rm -f libomp.so; \ From 0390f7204d8bc755cf42ea1d5e71577d3c5c5ecb Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 4 Sep 2019 20:56:51 +0200 Subject: [PATCH 5/5] also install usr/lib/llvm-10/lib/libclang-cpp.so.10 --- debian/libclang-cppX.Y.install.in | 1 + debian/libclang-cppX.Y.links.in | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/libclang-cppX.Y.install.in b/debian/libclang-cppX.Y.install.in index 25c578ee..a6714393 100644 --- a/debian/libclang-cppX.Y.install.in +++ b/debian/libclang-cppX.Y.install.in @@ -1,2 +1,3 @@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/ usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so.1 +usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so.@LLVM_VERSION@ diff --git a/debian/libclang-cppX.Y.links.in b/debian/libclang-cppX.Y.links.in index 6d3ef536..8ad00921 100644 --- a/debian/libclang-cppX.Y.links.in +++ b/debian/libclang-cppX.Y.links.in @@ -1,2 +1 @@ -/usr/lib/@DEB_HOST_MULTIARCH@/libclang-cpp-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so.@LLVM_VERSION@ /usr/lib/@DEB_HOST_MULTIARCH@/libclang-cpp-@LLVM_VERSION@.so.1 usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so.1