From 8abad758300fa50bf72703a3bd5a24c448684279 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Fri, 11 Oct 2013 15:06:52 +0000 Subject: [PATCH] improve the links --- debian/libclang-3.3-dev.links.in | 4 ++-- debian/libclang1-3.3.links.in | 3 ++- debian/rules | 7 +++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/debian/libclang-3.3-dev.links.in b/debian/libclang-3.3-dev.links.in index 61b62dab..6cb876ee 100644 --- a/debian/libclang-3.3-dev.links.in +++ b/debian/libclang-3.3-dev.links.in @@ -1,2 +1,2 @@ -usr/lib/llvm-3.3/lib/libclang.so /usr/lib/@DEB_HOST_MULTIARCH@/libclang-3.3.so - +usr/lib/llvm-3.3/lib/libclang-3.3.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libclang-3.3.so +usr/lib/llvm-3.3/lib/libclang-3.3.so.1 /usr/lib/llvm-3.3/lib/libclang-3.3.so diff --git a/debian/libclang1-3.3.links.in b/debian/libclang1-3.3.links.in index 38f6f61a..33966ea4 100644 --- a/debian/libclang1-3.3.links.in +++ b/debian/libclang1-3.3.links.in @@ -1 +1,2 @@ -usr/lib/llvm-3.3/lib/libclang.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libclang-3.3.so.1 +usr/lib/llvm-3.3/lib/libclang-3.3.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/libclang-3.3.so.1 +usr/lib/llvm-3.3/lib/libclang-3.3.so.1 usr/lib/llvm-3.3/lib/libclang.so.1 diff --git a/debian/rules b/debian/rules index 8ca6a48f..8c0041e4 100755 --- a/debian/rules +++ b/debian/rules @@ -179,7 +179,8 @@ build_doc: done override_dh_auto_install: - $(MAKE) -C $(TARGET_BUILD) VERBOSE=1 install DESTDIR=$(CURDIR)/debian/tmp/ + $(MAKE) -C $(TARGET_BUILD) VERBOSE=1 install DESTDIR=$(CURDIR)/debian/tmp/ + chrpath -d $(TARGET_BUILD)/Release/bin/clang chrpath -d `find $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/bin/ -type f -executable` @@ -188,7 +189,9 @@ override_dh_auto_install: mv $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/liblldb.so $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/liblldb.so.$(SONAME_EXT); \ fi - cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/ && mv libclang.so libclang.so.$(SONAME_EXT) && ln -s libclang.so.$(SONAME_EXT) libclang.so + mv $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/libclang.so $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/libclang-$(LLVM_VERSION).so.$(SONAME_EXT) +# cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/ && mv libclang.so libclang.so.$(SONAME_EXT) && ln -s libclang.so.$(SONAME_EXT) libclang.so + # cd $(TARGET_BUILD)/tools/clang/runtime/compiler-rt/ && rm -rf $$(find . -iname "SubDir.lib*" -o -iname .dir) && rm -rf $$(find -empty) mkdir -p $(CURDIR)/debian/clang-$(LLVM_VERSION)/usr/bin/