fix the build with cmake

This commit is contained in:
Sylvestre Ledru 2016-02-15 19:13:13 +00:00
parent b69ddd8385
commit ac8d009c00
9 changed files with 23 additions and 15 deletions

9
debian/changelog vendored
View File

@ -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 <sylvestre@debian.org> 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

View File

@ -1,2 +1 @@
tools/clang/docs/_build/html/
build-llvm/tools/clang/docs/html/

View File

@ -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@

View File

@ -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/

View File

@ -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

View File

@ -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/

View File

@ -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/

View File

@ -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-*

12
debian/rules vendored
View File

@ -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: