From db9c5207f76f9be63e4ad1a776ccf612c98a6e98 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 14 Oct 2013 09:30:07 +0000 Subject: [PATCH] libclang follow the same install partners as libLLVM --- debian/libclang-3.3-dev.links.in | 4 ++-- debian/libclang1-3.3.install.in | 1 + debian/libclang1-3.3.links.in | 2 -- debian/rules | 6 ++++-- 4 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 debian/libclang1-3.3.install.in delete mode 100644 debian/libclang1-3.3.links.in diff --git a/debian/libclang-3.3-dev.links.in b/debian/libclang-3.3-dev.links.in index 6cb876ee..5dd5ccad 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-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 +usr/lib/@DEB_HOST_MULTIARCH@/libclang-3.3.so.1 usr/lib/@DEB_HOST_MULTIARCH@/libclang-3.3.so +usr/lib/@DEB_HOST_MULTIARCH@/libclang-3.3.so.1 usr/lib/llvm-3.3/lib/libclang-3.3.so diff --git a/debian/libclang1-3.3.install.in b/debian/libclang1-3.3.install.in new file mode 100644 index 00000000..dbf10f09 --- /dev/null +++ b/debian/libclang1-3.3.install.in @@ -0,0 +1 @@ +usr/lib/llvm-3.3/lib/libclang-3.3.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/ diff --git a/debian/libclang1-3.3.links.in b/debian/libclang1-3.3.links.in deleted file mode 100644 index 33966ea4..00000000 --- a/debian/libclang1-3.3.links.in +++ /dev/null @@ -1,2 +0,0 @@ -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 914500f0..eea765f9 100755 --- a/debian/rules +++ b/debian/rules @@ -70,8 +70,9 @@ ifneq (,$(filter scan-build,$(DEB_BUILD_OPTIONS))) PRE_CONFIGURE=scan-build endif +LLDB_ARCHS := hurd-i386 LLDB_ENABLE=yes -ifneq (,$(findstring $(DEB_HOST_ARCH), hurd)) +ifneq (,$(findstring $(DEB_HOST_ARCH),$(LLDB_ARCHS))) LLDB_ENABLE=no endif @@ -82,7 +83,7 @@ endif debian/%: debian/%.in sed -e 's|@DEB_HOST_MULTIARCH@|$(DEB_HOST_MULTIARCH)|g' -e "s|@OCAML_STDLIB_DIR@|$(OCAML_STDLIB_DIR)|g" -e "s|@LLVM_VERSION@|$(LLVM_VERSION)|g" $< > $@ -override_dh_auto_configure: debian/lldb-$(LLVM_VERSION).install debian/lldb-$(LLVM_VERSION).links debian/libllvm$(LLVM_VERSION).install debian/llvm-$(LLVM_VERSION)-dev.links debian/libllvm-$(LLVM_VERSION)-ocaml-dev.install debian/libllvm-$(LLVM_VERSION)-ocaml-dev.dirs debian/llvm-$(LLVM_VERSION)-runtime.binfmt debian/llvm-$(LLVM_VERSION)-runtime.prerm debian/libclang-$(LLVM_VERSION)-dev.links debian/libclang1-$(LLVM_VERSION).links debian/pollycc +override_dh_auto_configure: debian/lldb-$(LLVM_VERSION).install debian/lldb-$(LLVM_VERSION).links debian/libllvm$(LLVM_VERSION).install debian/llvm-$(LLVM_VERSION)-dev.links debian/libllvm-$(LLVM_VERSION)-ocaml-dev.install debian/libllvm-$(LLVM_VERSION)-ocaml-dev.dirs debian/llvm-$(LLVM_VERSION)-runtime.binfmt debian/llvm-$(LLVM_VERSION)-runtime.prerm debian/libclang-$(LLVM_VERSION)-dev.links debian/libclang1-$(LLVM_VERSION).links debian/libclang1-$(LLVM_VERSION).install debian/pollycc echo "Using gcc: " $(CC) -v mkdir -p $(TARGET_BUILD) @@ -184,6 +185,7 @@ override_dh_auto_install: chrpath -d `find $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/bin/ -type f -executable` mv $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM-$(LLVM_VERSION)*.so $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM-$(LLVM_VERSION).so.$(SONAME_EXT) + if test $(LLDB_ENABLE) = yes; then \ 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