From 1ea7b813b80692cb587d0f7632c233d066aff27c Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 25 Sep 2019 08:31:00 +0200 Subject: [PATCH] * Fix the FTBFS on all platform by adding -DCLANG_BUILD_EXAMPLES=OFF to cmake. So, the following libs aren't built anymore: - usr/lib/llvm-9/lib/SampleAnalyzerPlugin.so - usr/lib/llvm-9/lib/CheckerDependencyHandlingAnalyzerPlugin.so - usr/lib/llvm-9/lib/CheckerOptionHandlingAnalyzerPlugin.so --- debian/changelog | 12 ++++++++++++ debian/libclang-X.Y-dev.install.in | 3 --- debian/rules | 1 + 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index ce593bd8..fcf4c398 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +llvm-toolchain-9 (1:9-1) unstable; urgency=medium + + * New release + * Fix the FTBFS on all platform by adding -DCLANG_BUILD_EXAMPLES=OFF + to cmake. + So, the following libs aren't built anymore: + - usr/lib/llvm-9/lib/SampleAnalyzerPlugin.so + - usr/lib/llvm-9/lib/CheckerDependencyHandlingAnalyzerPlugin.so + - usr/lib/llvm-9/lib/CheckerOptionHandlingAnalyzerPlugin.so + + -- Sylvestre Ledru Tue, 24 Sep 2019 21:09:57 +0200 + llvm-toolchain-9 (1:9~+rc5-1~exp2) experimental; urgency=medium * debian/patches/D67877.patch: fix LLVMExports.cmake with upstream-proposed diff --git a/debian/libclang-X.Y-dev.install.in b/debian/libclang-X.Y-dev.install.in index 3124b33a..55889786 100644 --- a/debian/libclang-X.Y-dev.install.in +++ b/debian/libclang-X.Y-dev.install.in @@ -3,6 +3,3 @@ 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/lib/llvm-@LLVM_VERSION@/lib/libfindAllSymbols.a -usr/lib/llvm-@LLVM_VERSION@/lib/SampleAnalyzerPlugin.so -usr/lib/llvm-@LLVM_VERSION@/lib/CheckerDependencyHandlingAnalyzerPlugin.so -usr/lib/llvm-@LLVM_VERSION@/lib/CheckerOptionHandlingAnalyzerPlugin.so diff --git a/debian/rules b/debian/rules index ba67c9a6..5d647c19 100755 --- a/debian/rules +++ b/debian/rules @@ -415,6 +415,7 @@ override_dh_auto_configure: preconfigure -DLLVM_TEMPORARILY_ALLOW_OLD_TOOLCHAIN=ON \ -DCLANG_VENDOR=$(VENDOR) \ -DCLANG_ENABLE_BOOTSTRAP=ON \ + -DCLANG_BUILD_EXAMPLES=OFF \ -DBOOTSTRAP_CMAKE_CXX_FLAGS='$(BOOTSTRAP_CXXFLAGS_EXTRA)' \ -DBOOTSTRAP_CMAKE_C_FLAGS='$(BOOTSTRAP_CFLAGS_EXTRA)' \ -DCLANG_BOOTSTRAP_PASSTHROUGH="CMAKE_INSTALL_PREFIX;CMAKE_VERBOSE_MAKEFILE;CMAKE_BUILD_TYPE;CMAKE_CXX_FLAGS_RELWITHDEBINFO;LLVM_LINK_LLVM_DYLIB;LLVM_INSTALL_UTILS;LLVM_VERSION_SUFFIX;LLVM_ENABLE_SPHINX;SPHINX_WARNINGS_AS_ERRORS;LLVM_BUILD_LLVM_DYLIB;LLVM_ENABLE_RTTI;LLVM_ENABLE_FFI;LIBCLANG_LIBRARY_VERSION;ENABLE_LINKER_BUILD_ID;POLLY_BUNDLED_JSONCPP;LLVM_EXPERIMENTAL_TARGETS_TO_BUILD;LLVM_USE_PERF;LLVM_ENABLE_ASSERTIONS;LLVM_BINUTILS_INCDIR;LLVM_HOST_TRIPLE;;LLVM_COMPILER_CHECKED;COMPILER_RT_BUILD_BUILTINS;LIBOMP_LIBFLAGS;CMAKE_SHARED_LINKER_FLAGS;PYTHON_EXECUTABLE"