From ac8d009c000b1e91f88b934e88404cd93a54a380 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Mon, 15 Feb 2016 19:13:13 +0000 Subject: [PATCH] fix the build with cmake --- debian/changelog | 9 ++++++++- debian/clang-X.Y-doc.docs.in | 3 +-- debian/clang-X.Y.install.in | 1 + debian/libclang-X.Y-dev.install.in | 1 + debian/libclang1-X.Y.install.in | 1 + debian/llvm-X.Y-dev.install.in | 2 +- debian/llvm-X.Y-doc.install.in | 7 +------ debian/llvm-X.Y.install.in | 2 ++ debian/rules | 12 +++++++----- 9 files changed, 23 insertions(+), 15 deletions(-) diff --git a/debian/changelog b/debian/changelog index 34886cda..3dc9c702 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,12 @@ -llvm-toolchain-snapshot (1:3.9~svn255217-1~exp2) experimental; urgency=medium +llvm-toolchain-snapshot (1:3.9~svn260815-1~exp1) experimental; urgency=medium + * New snapshot release + + -- Sylvestre Ledru Sat, 13 Feb 2016 15:12:42 +0100 + +llvm-toolchain-snapshot (1:3.9~svn260089-1) unstable; urgency=medium + + * New snapshot * Switch to 3.9 (remove lldb-3.9-dev as it was a transitionnal pkg) * Update the clang description for something more accurate (C++-11, 14, etc) * Cmake migration. Done by Andrew Wilkins. Many thanks to him diff --git a/debian/clang-X.Y-doc.docs.in b/debian/clang-X.Y-doc.docs.in index b3cc6a07..ebca7763 100644 --- a/debian/clang-X.Y-doc.docs.in +++ b/debian/clang-X.Y-doc.docs.in @@ -1,2 +1 @@ -tools/clang/docs/_build/html/ - +build-llvm/tools/clang/docs/html/ diff --git a/debian/clang-X.Y.install.in b/debian/clang-X.Y.install.in index 81055b24..67d06986 100644 --- a/debian/clang-X.Y.install.in +++ b/debian/clang-X.Y.install.in @@ -9,6 +9,7 @@ usr/lib/llvm-@LLVM_VERSION@/bin/sancov tools/clang/tools/scan-build-@LLVM_VERSION@ usr/share/clang/ tools/clang/tools/scan-view-@LLVM_VERSION@ usr/share/clang/ #usr/share/man/man1/clang.1 usr/share/man/man1/ +usr/lib/llvm-@LLVM_VERSION@/lib/cmake/clang/*.cmake usr/share/llvm-@LLVM_VERSION@/cmake/ usr/bin/clang-@LLVM_VERSION@ usr/bin/clang++-@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/libclang1-X.Y.install.in b/debian/libclang1-X.Y.install.in index 48a548a5..27c6af7b 100644 --- a/debian/libclang1-X.Y.install.in +++ b/debian/libclang1-X.Y.install.in @@ -1,2 +1,3 @@ usr/lib/llvm-@LLVM_VERSION@/lib/libclang-@LLVM_VERSION@.so.1 /usr/lib/@DEB_HOST_MULTIARCH@/ +usr/lib/llvm-@LLVM_VERSION@/lib/libclang.so.1 diff --git a/debian/llvm-X.Y-dev.install.in b/debian/llvm-X.Y-dev.install.in index 813b6f2f..f25e509a 100644 --- a/debian/llvm-X.Y-dev.install.in +++ b/debian/llvm-X.Y-dev.install.in @@ -6,7 +6,7 @@ usr/lib/llvm-@LLVM_VERSION@/lib/BugpointPasses.so usr/lib/llvm-@LLVM_VERSION@/include/llvm/ usr/include/llvm-@LLVM_VERSION@/ usr/lib/llvm-@LLVM_VERSION@/include/llvm-c/ usr/include/llvm-c-@LLVM_VERSION@/ # Explicit debian/tmp since there are multiple declarations -debian/tmp/usr/lib/llvm-@LLVM_VERSION@/share/llvm/cmake/*.cmake usr/share/llvm-@LLVM_VERSION@/cmake/ +debian/tmp/usr/lib/llvm-@LLVM_VERSION@/lib/cmake/llvm/*.cmake usr/share/llvm-@LLVM_VERSION@/cmake/ utils/vim/indent/llvm-@LLVM_VERSION@.vim usr/share/vim/addons/indent/ diff --git a/debian/llvm-X.Y-doc.install.in b/debian/llvm-X.Y-doc.install.in index 6ac115a5..c85eb0f3 100644 --- a/debian/llvm-X.Y-doc.install.in +++ b/debian/llvm-X.Y-doc.install.in @@ -1,6 +1 @@ -docs/_build/html usr/share/doc/llvm-@LLVM_VERSION@-doc/ -#usr/lib/llvm-@LLVM_VERSION@/docs/llvm/html.tar.gz -#usr/lib/llvm-@LLVM_VERSION@/docs/llvm/ocamldoc.tar.gz -#usr/lib/llvm-@LLVM_VERSION@/docs/llvm/html/Dummy.html -#usr/lib/llvm-@LLVM_VERSION@/docs/llvm/html/doxygen.css -#usr/lib/llvm-@LLVM_VERSION@/docs/llvm/html/LibASTMatchersReference.html +build-llvm/docs/html usr/share/doc/llvm-@LLVM_VERSION@-doc/ diff --git a/debian/llvm-X.Y.install.in b/debian/llvm-X.Y.install.in index 0fd6a1e4..88934484 100644 --- a/debian/llvm-X.Y.install.in +++ b/debian/llvm-X.Y.install.in @@ -5,6 +5,7 @@ usr/lib/llvm-@LLVM_VERSION@/bin/llc* usr/lib/llvm-@LLVM_VERSION@/bin/obj2yaml usr/lib/llvm-@LLVM_VERSION@/bin/yaml2obj usr/lib/llvm-@LLVM_VERSION@/bin/verify-uselistorder +usr/lib/llvm-@LLVM_VERSION@/bin/sanstats usr/bin/llvm-* usr/bin/opt* usr/bin/bugpoint* @@ -12,3 +13,4 @@ usr/bin/llc* usr/bin/obj2yaml-* usr/bin/yaml2obj-* usr/bin/verify-uselistorder-* +usr/bin/sanstats-* diff --git a/debian/rules b/debian/rules index 6902309c..02ba3163 100755 --- a/debian/rules +++ b/debian/rules @@ -238,6 +238,7 @@ override_dh_auto_configure: preconfigure -DLLVM_LINK_LLVM_DYLIB=ON \ -DLLVM_VERSION_SUFFIX= \ -DLLVM_ENABLE_SPHINX=ON \ + -DLLVM_BUILD_LLVM_DYLIB=ON \ -DLLVM_ENABLE_RTTI=ON \ -DLLVM_ENABLE_FFI=ON \ $(CMAKE_EXTRA) \ @@ -302,13 +303,13 @@ endif # Only run on executable, not script chrpath -d `find $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/ -type f -executable -exec file -i '{}' \; | grep 'x-executable; charset=binary'|cut -d: -f1` + cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/ && \ + mv libclang.so.$(SONAME_EXT) libclang-$(LLVM_VERSION).so.$(SONAME_EXT) && \ + ln -s libclang-$(LLVM_VERSION).so.$(SONAME_EXT) libclang.so.$(SONAME_EXT); \ + ln -s libclang-$(LLVM_VERSION).so.$(SONAME_EXT) libclang-$(LLVM_VERSION).so # Add the trailing soname ifeq (${AUTOCONF_BUILD},yes) - cd debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/ && \ - mv libclang.so libclang-$(LLVM_VERSION).so.$(SONAME_EXT) && \ - ln -s libclang-$(LLVM_VERSION).so.$(SONAME_EXT) libclang.so.$(SONAME_EXT); \ - ln -s libclang-$(LLVM_VERSION).so.$(SONAME_EXT) libclang-$(LLVM_VERSION).so; \ if test "$(LLDB_ENABLE)" = yes; then \ mv liblldb.so liblldb-$(LLVM_VERSION).so.$(SONAME_EXT) && \ ln -s liblldb-$(LLVM_VERSION).so.$(SONAME_EXT) liblldb.so.$(SONAME_EXT); \ @@ -373,7 +374,7 @@ endif 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/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 @@ -466,6 +467,7 @@ override_dh_strip: override_dh_install: + cp $(TARGET_BUILD)/lib/libLLVM-$(LLVM_VERSION).so $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM-$(LLVM_VERSION).so.$(SONAME_EXT) dh_install --fail-missing override_dh_installdeb: