From 5eecc2f0b922ec8a87fd2d08edaca67ccecfbeeb Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 9 Mar 2016 18:31:51 +0000 Subject: [PATCH] Remove the autoconf section --- debian/changelog | 8 ++- debian/rules | 142 ++++++----------------------------------------- 2 files changed, 25 insertions(+), 125 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0a114b61..c5be35c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,10 @@ -llvm-toolchain-snapshot (1:3.9~svn262954-1) unstable; urgency=medium +llvm-toolchain-snapshot (1:3.9~svn260851-2) UNRELEASED; urgency=medium + + * Remove the autoconf section + + -- Sylvestre Ledru Wed, 09 Mar 2016 19:30:30 +0100 + +llvm-toolchain-snapshot (1:3.9~svn260851-1) unstable; urgency=medium * New snapshot * Switch to 3.9 (remove lldb-3.9-dev as it was a transitionnal pkg) diff --git a/debian/rules b/debian/rules index 596974c0..ba9ae48d 100755 --- a/debian/rules +++ b/debian/rules @@ -17,11 +17,6 @@ endif VENDOR=$(shell lsb_release -is) -AUTOCONF_BUILD=no -ifeq (${AUTOCONF_BUILD},yes) -BUILD_DIR=Release -endif - DEB_HOST_MULTIARCH = $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) DEB_HOST_GNU_TYPE = $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_HOST_ARCH_BITS = $(shell dpkg-architecture -qDEB_HOST_ARCH_BITS) @@ -207,58 +202,26 @@ override_dh_auto_configure: preconfigure # TODO(axw) specify build type for CMake # TODO(axw) pass compiler flags, etc. - if test $(AUTOCONF_BUILD) = yes; then \ - cd $(TARGET_BUILD); \ - $(PRE_PROCESS_CONF) \ - ../configure $(confargs) \ - --prefix=/usr/lib/llvm-$(LLVM_VERSION) \ - --bindir=\$${prefix}/bin/ \ - --disable-assertions \ - --enable-shared \ - --enable-optimized \ - --with-optimize-option=' $(opt_flags)' \ - --enable-pic \ - --enable-libffi \ - --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ - --with-binutils-include=/usr/include \ - --with-cloog --with-isl \ - --with-bug-report-url=http://bugs.debian.org/ \ - --enable-shared \ - --disable-bindings \ - --with-clang-default-openmp-runtime=libomp \ - $(CONFIGURE_EXTRA) \ - CLANG_VENDOR=$(VENDOR) || { cat config.log tools/polly/config.log; exit 1; }; \ - else \ - cd $(TARGET_BUILD) && \ - cmake ../ \ - -DCMAKE_INSTALL_PREFIX=/usr/lib/llvm-$(LLVM_VERSION) \ - -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo \ - -DCMAKE_CXX_FLAGS=$(CXXFLAGS_EXTRA) \ - -DLLVM_LINK_LLVM_DYLIB=ON \ - -DLLVM_VERSION_SUFFIX= \ - -DLLVM_ENABLE_SPHINX=ON \ - -DSPHINX_WARNINGS_AS_ERRORS=OFF \ - -DLLVM_BUILD_LLVM_DYLIB=ON \ - -DLLVM_ENABLE_RTTI=ON \ - -DLLVM_ENABLE_FFI=ON \ - $(CMAKE_EXTRA) \ - -DLIBCLANG_LIBRARY_VERSION=$(SONAME_EXT); \ - fi + cd $(TARGET_BUILD) && \ + cmake ../ \ + -DCMAKE_INSTALL_PREFIX=/usr/lib/llvm-$(LLVM_VERSION) \ + -DCMAKE_VERBOSE_MAKEFILE=ON \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_CXX_FLAGS=$(CXXFLAGS_EXTRA) \ + -DLLVM_LINK_LLVM_DYLIB=ON \ + -DLLVM_VERSION_SUFFIX= \ + -DLLVM_ENABLE_SPHINX=ON \ + -DSPHINX_WARNINGS_AS_ERRORS=OFF \ + -DLLVM_BUILD_LLVM_DYLIB=ON \ + -DLLVM_ENABLE_RTTI=ON \ + -DLLVM_ENABLE_FFI=ON \ + $(CMAKE_EXTRA) \ + -DLIBCLANG_LIBRARY_VERSION=$(SONAME_EXT); \ override_dh_auto_build: $(PRE_PROCESS) $(MAKE) $(NJOBS) -C $(TARGET_BUILD) VERBOSE=1 CLANG_VENDOR=$(VENDOR) CXXFLAGS="$(CXXFLAGS_EXTRA)" LDFLAGS="$(LDFLAGS_EXTRA)" REQUIRES_RTTI=1 DEBUGMAKE=1 -ifeq (${AUTOCONF_BUILD},yes) -# We run the build with the Asserts, new directory, make a symlink to make -# sure the rest still work - cd $(TARGET_BUILD) \ - if test -d Release+Asserts -a ! -e Release; then \ - ln -s Release+Asserts Release; \ - fi -endif - override_dh_prep: build_doc dh_prep @@ -297,9 +260,7 @@ override_dh_auto_install: rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin/argdumper rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/clang/clang-format-bbedit.applescript -ifneq (${AUTOCONF_BUILD},yes) cp $(TARGET_BUILD)/bin/clang-query $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin -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` @@ -309,15 +270,6 @@ endif 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) - 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); \ - fi; \ - rm -f libLLVM-$(LLVM_VERSION_FULL).so -endif - # Remove artefact (where compiler-rt is built) # if test -d $(TARGET_BUILD)/tools/clang/runtime/compiler-rt/clang_linux; then \ # cd $(TARGET_BUILD)/tools/clang/runtime/compiler-rt/clang_linux && rm -rf $$(find . -mindepth 2 -maxdepth 2 -type d) && rm -rf $$(find -empty) && rm -rf */.dir; \ @@ -337,26 +289,14 @@ endif # idem for the lldb python binding mkdir -p $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/python2.7/site-packages/lldb/ -# Copy things that are installed by CMake but not autoconf, -# and remove things that are installed by autoconf but are -# not intended for distribution. -ifeq (${AUTOCONF_BUILD},yes) - cp -p clang/tools/clang-format/git-clang-format $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/bin - cp -p clang/tools/clang-format/clang-format-diff.py $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/clang - cp -p clang/tools/clang-format/clang-format.py $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/clang - cp -p clang/tools/clang-format/clang-format.el $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/clang - cp -p clang/tools/clang-format/clang-format-sublime.py $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/share/clang -endif - mv $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM-$(LLVM_VERSION).so $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/libLLVM-$(LLVM_VERSION).so.$(SONAME_EXT) cd $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/ && ln -s libLLVM-$(LLVM_VERSION).so.$(SONAME_EXT) libLLVM-$(LLVM_VERSION).so -# Remove things that CMake or autoconf install but which aren't packaged yet, +# Remove things that CMake install but which aren't packaged yet, # or are packaged from the source or build tree. -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 + # 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 @@ -400,8 +340,7 @@ endif cp -fR $(CURDIR)/clang/tools/scan-view clang/tools/scan-view-$(LLVM_VERSION) # Remove some license files - rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/include/llvm/Support/LICENSE.TXT \ - $(CURDIR)/debian/llvm-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/build/autoconf/LICENSE.TXT + rm -f $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/include/llvm/Support/LICENSE.TXT # Change CMake module dir sed -i 's|LLVM_CMAKE_DIR "/usr/lib/llvm-$(LLVM_VERSION)/share/llvm/cmake"|LLVM_CMAKE_DIR "/usr/share/llvm-$(LLVM_VERSION)/cmake"|' $(DEB_INST)/usr/lib/llvm-$(LLVM_VERSION)/lib/cmake/llvm/LLVMConfig.cmake @@ -450,22 +389,17 @@ override_dh_installdeb: rm -f $(CURDIR)/debian/tmp/usr/lib/llvm-$(LLVM_VERSION)/lib/python*/site-packages/lldb/__init__.pyc $(CURDIR)/debian/python-lldb-$(LLVM_VERSION)/usr/lib/llvm-$(LLVM_VERSION)/lib/python*/site-packages/lldb/__init__.pyc rm -f $(CURDIR)/debian/clang-$(LLVM_VERSION)-examples/usr/share/doc/clang-$(LLVM_VERSION)-examples/examples/*Make* - rm -f $(CURDIR)//debian/llvm-$(LLVM_VERSION)-dev/usr/lib/llvm-$(LLVM_VERSION)/build/autoconf/LICENSE.TXT # Remove auto generated python pyc find $(CURDIR)/debian/llvm-$(LLVM_VERSION)-tools/usr/lib/llvm-$(LLVM_VERSION)/ -name '*.pyc' | xargs -r rm -f - - ifeq (,$(filter nocheck, $(DEB_BUILD_OPTIONS))) # List of the archs we know we have 100 % tests working ARCH_LLVM_TEST_OK := i386 override_dh_auto_test: -ifneq (${AUTOCONF_BUILD},yes) - # LLVM tests (CMake) ifneq (,$(findstring $(DEB_HOST_ARCH),$(ARCH_LLVM_TEST_OK))) $(MAKE) $(NJOBS) -C $(TARGET_BUILD) check-llvm @@ -486,45 +420,6 @@ ifeq (${POLLY_ENABLE},yes) $(MAKE) $(NJOBS) -C $(TARGET_BUILD) check-polly || true endif -else # Autoconf build - -# LLVM tests -ifneq (,$(findstring $(DEB_HOST_ARCH),$(ARCH_LLVM_TEST_OK))) -# Fail the build if the test fails - NJOBS="$(NJOBS)" LD_LIBRARY_PATH=$(CURDIR)/$(TARGET_BUILD)/$(BUILD_DIR)/lib/ $(MAKE) -C $(TARGET_BUILD) check -else - NJOBS="$(NJOBS)" LD_LIBRARY_PATH=$(CURDIR)/$(TARGET_BUILD)/$(BUILD_DIR)/lib/ $(MAKE) -C $(TARGET_BUILD) check || true -endif - -# clang tests -# setup the env - cd $(TARGET_BUILD)/$(BUILD_DIR)/lib/ && ln -s libclang.so libclang.so.$(SONAME_EXT) && ln -s libclang.so libclang-$(LLVM_VERSION).so.$(SONAME_EXT) - cd $(TARGET_BUILD)/ && $(MAKE) -C tools/clang/ test || true - rm -f $(TARGET_BUILD)/$(BUILD_DIR)/lib/libclang.so.$(SONAME_EXT) $(TARGET_BUILD)/$(BUILD_DIR)/lib/libclang-$(LLVM_VERSION).so.$(SONAME_EXT) - - -# lldb tests -ifeq (,$(filter $(DEB_HOST_ARCH), $(LLDB_DISABLE_ARCHS) armhf armel)) - if test "$(LLDB_ENABLE)" = yes; then \ - cd $(TARGET_BUILD)/$(BUILD_DIR)/lib/python2.7/site-packages/lldb && if test ! -h _lldb.so -o ! -f _lldb.so; then ln -s ../../../liblldb.so _lldb.so; fi; \ - if test ! -h libLLVM-$(LLVM_VERSION).so.$(SONAME_EXT) -o ! -f _lldb.so; then \ - ln -s ../../../libLLVM-$(LLVM_VERSION_FULL).so libLLVM-$(LLVM_VERSION).so.$(SONAME_EXT); \ - fi; \ - if test ! -h libLLVM-$(LLVM_VERSION_FULL).so.$(SONAME_EXT) -o ! -f _lldb.so; then \ - ln -s ../../../libLLVM-$(LLVM_VERSION_FULL).so libLLVM-$(LLVM_VERSION_FULL).so.$(SONAME_EXT); \ - fi; \ - fi - - cd $(TARGET_BUILD)/$(BUILD_DIR)/lib && \ - rm -f liblldb-$(LLVM_VERSION).so && \ - ln -s liblldb.so liblldb-$(LLVM_VERSION).so - - cd $(TARGET_BUILD)/ && $(MAKE) -C tools/lldb/test || true - if test -d $(TARGET_BUILD)/tools/lldb/test/lldb-test-traces/; then \ - cat $(TARGET_BUILD)/tools/lldb/test/lldb-test-traces/*; \ - fi -endif - # Managed by debian build system rm -f $(CURDIR)/$(TARGET_BUILD)/$(BUILD_DIR)/lib/python*/site-packages/lldb/_lldb.so $(TARGET_BUILD)/$(BUILD_DIR)/lib/liblldb-$(LLVM_VERSION).so @@ -542,7 +437,6 @@ endif lcov --remove $$REPORT "/usr*" -o $$REPORT; \ genhtml -o reports/coverage --show-details --highlight --legend $$REPORT; \ fi -endif override_dh_auto_test: endif