From: Peter Michael Green Date: Sun, 26 Mar 2017 12:38:26 +0000 (+0000) Subject: Manual merge of version 1:3.8.1-17+rpi1 and 1:3.8.1-18 to produce 1:3.8.1-18+rpi1 X-Git-Tag: archive/raspbian/1%3.8.1-18+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=332520bf0cfef37afbcefbf97d5ff565d7003093;p=llvm-toolchain-3.8.git Manual merge of version 1:3.8.1-17+rpi1 and 1:3.8.1-18 to produce 1:3.8.1-18+rpi1 --- 332520bf0cfef37afbcefbf97d5ff565d7003093 diff --cc debian/changelog index a0cabb20,c7bac9b5..37e086d6 --- a/debian/changelog +++ b/debian/changelog @@@ -1,28 -1,8 +1,34 @@@ - llvm-toolchain-3.8 (1:3.8.1-17+rpi1) stretch-staging; urgency=medium ++llvm-toolchain-3.8 (1:3.8.1-18+rpi1) stretch-staging; urgency=medium + + [changes brought forward from 1:3.8-2+rpi1 by Peter Michael Green at Sat, 14 May 2016 21:43:35 +0000] + * Pass armv6-* as triplet rather than arm-* to hopefully stop llvm toolchain + assuming armv7. (didn't work, it appears that Debian isn't currently using + the autoconf based build). + * Cleanup .pyc files in clean target. + * Add a hack to the cmake based build to force armv6 (unfortunately the cmake + based build relies on config.guess which assumes you want to build for the + hardware you are running on). + * Remove -march=armv7-a in compiler-rt/cmake/config-ix.cmake + * Add -DCOMPILER_RT_BUILD_BUILTINS=OFF to disable parts of compiler-rt that + are broken on lower arm architectures. + [changes introduced in 1:3.8.1-12+rpi1 by Peter Michael Green] + * Disable testsuite, it seems to be crashing buildboxes. + + [changes brought forward from 1:3.8.1-12+rpi2 by Peter Michael Green at Mon, 03 Oct 2016 22:58:38 +0000] + * Really disable testsuite. + + [changes introduced in 1:3.8.1-17+rpi1 by Peter Michael Green] + * Remove more crap in clean target. + * Force creation of debian/man. + * Set config.guess.hack back to mode 644 in clean target to keep dgit happy. + - -- Peter Michael Green Thu, 02 Feb 2017 06:05:39 +0000 ++ -- Peter Micheal Green Sat, 25 Mar 2017 22:29:02 +0000 ++ + llvm-toolchain-3.8 (1:3.8.1-18) unstable; urgency=medium + + * Fix the broken liblldb-3.8-dev links (Closes: #856864) + + -- Sylvestre Ledru Sun, 12 Mar 2017 09:49:18 +0100 llvm-toolchain-3.8 (1:3.8.1-17) unstable; urgency=medium diff --cc debian/rules index a9b80a95,82469f3c..5985e42b --- a/debian/rules +++ b/debian/rules @@@ -488,77 -483,80 +488,80 @@@ override_dh_installdeb -ifeq (,$(filter nocheck, $(DEB_BUILD_OPTIONS))) -# List of the archs we know we have 100 % tests working -ARCH_LLVM_TEST_OK := i386 amd64 - -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 -else - $(MAKE) $(NJOBS) -C $(TARGET_BUILD) check-llvm || true -endif - -# Clang tests (CMake) - $(MAKE) $(NJOBS) -C $(TARGET_BUILD) check-clang || true - -# Sanitizer - $(MAKE) $(NJOBS) -C $(TARGET_BUILD) check-sanitizer || true - -# LLDB tests (CMake) -ifeq (,$(filter $(DEB_HOST_ARCH), $(LLDB_DISABLE_ARCHS) armhf armel)) -ifneq (,$(filter codecoverage,$(DEB_BUILD_OPTIONS))) - $(MAKE) $(NJOBS) -C $(TARGET_BUILD) check-lldb || true -endif -endif +#ifeq (,$(filter nocheck, $(DEB_BUILD_OPTIONS))) +## List of the archs we know we have 100 % tests working +#ARCH_LLVM_TEST_OK := i386 amd64 +# +#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 +#else +# $(MAKE) $(NJOBS) -C $(TARGET_BUILD) check-llvm || true +#endif +# +## Clang tests (CMake) +# $(MAKE) $(NJOBS) -C $(TARGET_BUILD) check-clang || true +# +## Sanitizer +# $(MAKE) $(NJOBS) -C $(TARGET_BUILD) check-sanitizer || true +# +## LLDB tests (CMake) +#ifeq (,$(filter $(DEB_HOST_ARCH), $(LLDB_DISABLE_ARCHS) armhf armel)) +#ifneq (,$(filter codecoverage,$(DEB_BUILD_OPTIONS))) +# $(MAKE) $(NJOBS) -C $(TARGET_BUILD) check-lldb || true +#endif +#endif # Polly tests (CMake) -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.1 && ln -s libclang.so libclang-$(LLVM_VERSION).so.1 - cd $(TARGET_BUILD)/ && $(MAKE) -C tools/clang/ test || true - rm -f $(TARGET_BUILD)/$(BUILD_DIR)/lib/libclang.so.1 $(TARGET_BUILD)/$(BUILD_DIR)/lib/libclang-$(LLVM_VERSION).so.1 - - -# 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 - - cd $(TARGET_BUILD)/$(BUILD_DIR)/lib && \ - rm -f liblldb-$(LLVM_VERSION).so -endif +#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.1 && ln -s libclang.so libclang-$(LLVM_VERSION).so.1 +# cd $(TARGET_BUILD)/ && $(MAKE) -C tools/clang/ test || true +# rm -f $(TARGET_BUILD)/$(BUILD_DIR)/lib/libclang.so.1 $(TARGET_BUILD)/$(BUILD_DIR)/lib/libclang-$(LLVM_VERSION).so.1 +# +# +## 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 ++# ++# cd $(TARGET_BUILD)/$(BUILD_DIR)/lib && \ ++# rm -f liblldb-$(LLVM_VERSION).so +#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