From db2178ef496e7aed6e89fd0bca3913dbc5863870 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 2 Mar 2020 18:57:26 +0100 Subject: [PATCH] Fix the libclang-cpp* packages --- debian/changelog | 1 + debian/libclang-cppX.Y-dev.install.in | 2 +- debian/libclang-cppX.Y-dev.links.in | 1 + debian/libclang-cppX.Y.install.in | 2 -- debian/libclang-cppX.Y.links.in | 3 +-- debian/rules | 7 ++----- 6 files changed, 6 insertions(+), 10 deletions(-) create mode 100644 debian/libclang-cppX.Y-dev.links.in diff --git a/debian/changelog b/debian/changelog index 31189849..3bf2de6a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ llvm-toolchain-10 (1:10.0.0~+rc2-3) unstable; urgency=medium FTBFS otherwise * Add a libclang-cpp10-dev package (needed to unbreak the cmake) https://bugs.llvm.org/show_bug.cgi?id=42432 + This makes libclang-cpp10 usable and polish the links and dups -- Sylvestre Ledru Sun, 01 Mar 2020 20:59:25 +0100 diff --git a/debian/libclang-cppX.Y-dev.install.in b/debian/libclang-cppX.Y-dev.install.in index cc6dc637..5d2609ec 100644 --- a/debian/libclang-cppX.Y-dev.install.in +++ b/debian/libclang-cppX.Y-dev.install.in @@ -1 +1 @@ -usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp@LLVM_VERSION@.so +usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so diff --git a/debian/libclang-cppX.Y-dev.links.in b/debian/libclang-cppX.Y-dev.links.in new file mode 100644 index 00000000..a882ad61 --- /dev/null +++ b/debian/libclang-cppX.Y-dev.links.in @@ -0,0 +1 @@ +usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so /usr/lib/@DEB_HOST_MULTIARCH@/libclang-cpp.so diff --git a/debian/libclang-cppX.Y.install.in b/debian/libclang-cppX.Y.install.in index a6714393..b0d88e0e 100644 --- a/debian/libclang-cppX.Y.install.in +++ b/debian/libclang-cppX.Y.install.in @@ -1,3 +1 @@ -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 80607601..ee382f6d 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.1 -/usr/lib/@DEB_HOST_MULTIARCH@/libclang-cpp-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libclang-cpp@LLVM_VERSION@.so \ No newline at end of file +usr/lib/llvm-@LLVM_VERSION@/lib/libclang-cpp.so.@LLVM_VERSION@ /usr/lib/@DEB_HOST_MULTIARCH@/libclang-cpp.so.@LLVM_VERSION@ diff --git a/debian/rules b/debian/rules index b9db5a59..01b0e88f 100755 --- a/debian/rules +++ b/debian/rules @@ -551,14 +551,11 @@ override_dh_auto_install: chrpath -d libcxxabi/build/lib/libc++abi.so.1.0 chrpath -d libcxx/build/lib/libc++.so.1.0 + : # libclang cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/ && rm -f libclang.so.$(SONAME_EXT) libclang-$(LLVM_VERSION).so; \ - cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/ && rm -f libclang.so.$(SONAME_EXT) libclang-cpp$(LLVM_VERSION).so; \ 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.$(LLVM_VERSION) - + : # libomp cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib && rm -f libomp.so; \ ln -s libomp.so.$(SONAME_OPENMP) libomp.so