diff --git a/debian/changelog b/debian/changelog index 211f7d5a..29b78b30 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +llvm-toolchain-3.8 (1:3.8-1) unstable; urgency=medium + + * New upstream release + * install missing file (TODO bug lldb) + + -- Sylvestre Ledru Thu, 03 Mar 2016 21:16:21 +0100 + llvm-toolchain-3.8 (1:3.8~+rc3-1~exp1) experimental; urgency=medium * New snapshot release diff --git a/debian/clang-X.Y.install.in b/debian/clang-X.Y.install.in index 81055b24..2bb961f9 100644 --- a/debian/clang-X.Y.install.in +++ b/debian/clang-X.Y.install.in @@ -5,6 +5,22 @@ usr/lib/llvm-@LLVM_VERSION@/bin/clang-apply-replacements usr/lib/llvm-@LLVM_VERSION@/bin/clang-query usr/lib/llvm-@LLVM_VERSION@/bin/clang-rename usr/lib/llvm-@LLVM_VERSION@/bin/sancov +usr/lib/llvm-@LLVM_VERSION@/share/scan-view/ +usr/lib/llvm-@LLVM_VERSION@/share/scan-build/ +usr/lib/llvm-@LLVM_VERSION@/share/man/man1/scan-build.1 +usr/lib/llvm-@LLVM_VERSION@/libexec/ccc-analyzer +usr/lib/llvm-@LLVM_VERSION@/libexec/c++-analyzer + +usr/lib/llvm-@LLVM_VERSION@/bin/scan-view +usr/lib/llvm-@LLVM_VERSION@/bin/clang-cl + +usr/lib/llvm-@LLVM_VERSION@/bin/scan-build +usr/lib/llvm-@LLVM_VERSION@/bin/modularize +usr/lib/llvm-@LLVM_VERSION@/bin/c-index-test + +usr/lib/llvm-@LLVM_VERSION@/share/clang/cmake/ + +usr/bin/c-index-test-@LLVM_VERSION@ tools/clang/tools/scan-build-@LLVM_VERSION@ usr/share/clang/ tools/clang/tools/scan-view-@LLVM_VERSION@ usr/share/clang/ @@ -17,5 +33,7 @@ usr/bin/clang-apply-replacements-@LLVM_VERSION@ usr/bin/clang-query-@LLVM_VERSION@ usr/bin/clang-rename-@LLVM_VERSION@ usr/bin/sancov-@LLVM_VERSION@ - -#usr/lib/llvm-@LLVM_VERSION@/share/man/man1/clang.1 +usr/bin/clang-cl-@LLVM_VERSION@ +usr/bin/modularize-@LLVM_VERSION@ +usr/bin/scan-build-@LLVM_VERSION@ +usr/bin/scan-view-@LLVM_VERSION@ diff --git a/debian/libclang-X.Y-dev.install.in b/debian/libclang-X.Y-dev.install.in index ac3e9ebc..d91e186b 100644 --- a/debian/libclang-X.Y-dev.install.in +++ b/debian/libclang-X.Y-dev.install.in @@ -1,6 +1,7 @@ usr/lib/llvm-@LLVM_VERSION@/include/clang usr/lib/llvm-@LLVM_VERSION@/include/clang-c usr/lib/llvm-@LLVM_VERSION@/lib/libclang*a +usr/lib/llvm-@LLVM_VERSION@/lib/libclang*so #usr/include/clang /usr/include/ #usr/include/clang-c /usr/include/ diff --git a/debian/libclang-common-X.Y-dev.install.in b/debian/libclang-common-X.Y-dev.install.in index 5e8d0787..ba08e70c 100644 --- a/debian/libclang-common-X.Y-dev.install.in +++ b/debian/libclang-common-X.Y-dev.install.in @@ -1,6 +1,7 @@ usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/include usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/lib +usr/lib/llvm-@LLVM_VERSION@/lib/clang/@LLVM_VERSION_FULL@/*.txt #usr/lib/clang/@LLVM_VERSION_FULL@/lib /usr/lib/clang/@LLVM_VERSION@/ #usr/lib/clang/@LLVM_VERSION_FULL@/include/ /usr/include/clang/@LLVM_VERSION@/ diff --git a/debian/liblldb-X.Y-dev.install.in b/debian/liblldb-X.Y-dev.install.in index 96c96b31..fc4f34b0 100644 --- a/debian/liblldb-X.Y-dev.install.in +++ b/debian/liblldb-X.Y-dev.install.in @@ -1,4 +1,5 @@ /usr/lib/llvm-@LLVM_VERSION@/include/lldb /usr/lib/llvm-@LLVM_VERSION@/lib/liblldb*a +/usr/lib/llvm-@LLVM_VERSION@/lib/liblldb*so diff --git a/debian/lldb-X.Y.install.in b/debian/lldb-X.Y.install.in index 8f865554..b4a4629b 100644 --- a/debian/lldb-X.Y.install.in +++ b/debian/lldb-X.Y.install.in @@ -2,6 +2,8 @@ usr/bin/lldb-@LLVM_VERSION@ usr/lib/llvm-@LLVM_VERSION@/bin/lldb usr/lib/llvm-@LLVM_VERSION@/bin/lldb-mi usr/lib/llvm-@LLVM_VERSION@/bin/lldb-server +usr/lib/llvm-@LLVM_VERSION@/bin/lldb-argdumper usr/bin/lldb-server-@LLVM_VERSION@ usr/bin/lldb-mi-@LLVM_VERSION@ +usr/bin/lldb-argdumper-@LLVM_VERSION@ \ No newline at end of file diff --git a/debian/llvm-X.Y-dev.install.in b/debian/llvm-X.Y-dev.install.in index 813b6f2f..85f07ac5 100644 --- a/debian/llvm-X.Y-dev.install.in +++ b/debian/llvm-X.Y-dev.install.in @@ -1,6 +1,9 @@ usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM*.a #usr/lib/llvm-@LLVM_VERSION@/lib/libllvm*.a usr/lib/llvm-@LLVM_VERSION@/lib/LLVM*.so +usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM.so +usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION@.so +usr/lib/llvm-@LLVM_VERSION@/lib/libLLVM-@LLVM_VERSION_FULL@.so usr/lib/llvm-@LLVM_VERSION@/lib/libLTO.* usr/lib/llvm-@LLVM_VERSION@/lib/BugpointPasses.so usr/lib/llvm-@LLVM_VERSION@/include/llvm/ usr/include/llvm-@LLVM_VERSION@/ diff --git a/debian/rules b/debian/rules index be4f96e9..20dd6dd5 100755 --- a/debian/rules +++ b/debian/rules @@ -353,42 +353,16 @@ ifneq (${AUTOCONF_BUILD},yes) mv $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/clang-$(LLVM_VERSION) \ $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/clang endif - rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/clang-cl - rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/scan-build - rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/scan-view - rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/c-index-test - rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/clang-tblgen - rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/pp-trace +# internal tools, don't care rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/count rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/not rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/FileCheck - rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/Reporter.py - rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/ScanView.py - rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/startfile.py - rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/lli-child-target - rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/lldb-argdumper - rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/lldb-$(LLVM_VERSION_FULL) - rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/lldb-mi-$(LLVM_VERSION_FULL) - rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/lldb-server-$(LLVM_VERSION_FULL) - rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/modularize - rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/libexec/c++-analyzer - rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/libexec/ccc-analyzer - rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libclang*.so - rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM*.so - rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/liblldb*.so - rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libclang.so.1 - rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/liblldb.so.1 - rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libPolly.a - rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libPollyISL.a - rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/clang/$(LLVM_VERSION_FULL)/*.txt +# Don't think it is used + rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libPolly*a +# Probably useless rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/python2.7/site-packages/six.py - rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/man/man1/scan-build.1 - rm -fr $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/clang/cmake/ - rm -fr $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/scan-view/ - rm -fr $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/docs/llvm/html/ - rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/docs/llvm/html.tar.gz - rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/scan-build/scanview.css - rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/scan-build/sorttable.js +# Don't want to install lldb-3.8.0-3.8 binaries (probably a bug) + rm -f $(DEB_INST)/usr/bin/*$(LLVM_VERSION_FULL)* # Rename binaries mkdir -p $(DEB_INST)/usr/bin/ @@ -449,7 +423,7 @@ endif override_dh_shlibdeps: - cd $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/ && ln -s libLLVM-$(LLVM_VERSION).so.1 libLLVM-$(LLVM_VERSION).so +# cd $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/ && ln -s libLLVM-$(LLVM_VERSION).so.1 libLLVM-$(LLVM_VERSION).so LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/ dh_shlibdeps override_dh_installman: