From: Raspbian forward pporter Date: Thu, 4 May 2017 21:43:49 +0000 (+0000) Subject: Merge version 1:3.8.1-18+rpi1 and 1:3.8.1-23 to produce 1:3.8.1-23+rpi1 X-Git-Tag: archive/raspbian/1%3.8.1-23+rpi1~3 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=6c2c7ed2ce25f8fe53e4ee7c578dd2c9b734f6f3;p=llvm-toolchain-3.8.git Merge version 1:3.8.1-18+rpi1 and 1:3.8.1-23 to produce 1:3.8.1-23+rpi1 --- 6c2c7ed2ce25f8fe53e4ee7c578dd2c9b734f6f3 diff --cc debian/changelog index 37e086d6,9052ad69..84b64996 --- a/debian/changelog +++ b/debian/changelog @@@ -1,28 -1,64 +1,90 @@@ - llvm-toolchain-3.8 (1:3.8.1-18+rpi1) stretch-staging; urgency=medium ++llvm-toolchain-3.8 (1:3.8.1-23+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 Micheal Green Sat, 25 Mar 2017 22:29:02 +0000 ++ -- Raspbian forward porter Thu, 04 May 2017 21:43:22 +0000 ++ + llvm-toolchain-3.8 (1:3.8.1-23) unstable; urgency=medium + + * Oups, same player try again (wrong package name, sorry) + + -- Sylvestre Ledru Tue, 25 Apr 2017 19:46:34 +0200 + + llvm-toolchain-3.8 (1:3.8.1-22) unstable; urgency=medium + + * Really fix "use versioned symbols" for llvm + Thanks to Julien Cristau for the patch (Closes: #849098) + + -- Sylvestre Ledru Tue, 25 Apr 2017 15:07:56 +0200 + + llvm-toolchain-3.8 (1:3.8.1-21) unstable; urgency=medium + + * Remove the scan-build-py-3.8 symlink (does not ship in 3.8) + + -- Sylvestre Ledru Sun, 23 Apr 2017 22:37:21 +0200 + + llvm-toolchain-3.8 (1:3.8.1-20) unstable; urgency=medium + + * Limit the archs where the ocaml binding is built + Should fix the FTBFS + Currently amd64 arm64 armel armhf i386 + + -- Sylvestre Ledru Sat, 15 Apr 2017 10:38:51 +0200 + + llvm-toolchain-3.8 (1:3.8.1-19) unstable; urgency=medium + + * Upload in unstable + * Bring back ocaml. Thanks to Cyril Soldani (Closes: #858626) + + -- Sylvestre Ledru Thu, 13 Apr 2017 19:19:09 +0200 + + llvm-toolchain-3.8 (1:3.8.1-19~exp4) experimental; urgency=medium + + * Add override_dh_makeshlibs for the libllvm or liblldb versions + Thanks to Julien Cristau for the patch + * Fix the symlink on scan-build-py + + -- Sylvestre Ledru Tue, 28 Mar 2017 06:32:40 +0200 + + llvm-toolchain-3.8 (1:3.8.1-19~exp3) experimental; urgency=medium + + * change the min version of the libclang1 symbols to 1:3.8.1-19~ + + -- Sylvestre Ledru Sun, 26 Mar 2017 17:19:38 +0200 + + llvm-toolchain-3.8 (1:3.8.1-19~exp2) experimental; urgency=medium + + * mark the first symbol as (optional) as it differs from ld and gold + * remove the empty llvm ocaml package (Closes: #858626) + + -- Sylvestre Ledru Sat, 25 Mar 2017 16:37:44 +0100 + + llvm-toolchain-3.8 (1:3.8.1-19~exp1) experimental; urgency=medium + + [ Rebecca N. Palmer ] + * Use versioned symbols (Closes: #849098) + + -- Sylvestre Ledru Sun, 19 Mar 2017 22:09:04 +0100 llvm-toolchain-3.8 (1:3.8.1-18) unstable; urgency=medium diff --cc debian/patches/series index 91d2711d,6b5de5ff..19a699ca --- a/debian/patches/series +++ b/debian/patches/series @@@ -56,5 -56,4 +56,6 @@@ lit-force-lang.dif clang-arm-default-vfp3-on-armv7a.patch lldb-server-path.diff lldb-server-link.diff + add_symbols_versioning.patch +cmake-arm-version-hack.patch +remove-more-crap-in-clean-target diff --cc debian/rules index 5985e42b,6964e487..582b195a --- a/debian/rules +++ b/debian/rules @@@ -138,17 -134,23 +136,27 @@@ els CMAKE_EXTRA += -DLLDB_DISABLE_LIBEDIT=ON endif + DH_OPTIONS= - %: - dh $@ --with ocaml + OCAML_ENABLE= no + OCAML_ARCHS := amd64 arm64 armel armhf i386 + ifneq (,$(filter $(DEB_HOST_ARCH),$(OCAML_ARCHS))) + # Enable OCAML for this arch. + OCAML_ENABLE=yes + OCAML_STDLIB_DIR ?= $(shell ocamlc -where) + DH_OPTIONS=--with ocaml + endif + %: + dh $@ $(DH_OPTIONS) + preconfigure: + # add executable flag to script we added as part of triplet hack + # --plugwash + chmod 755 autoconf/config.guess.hack + for f in debian/*.in; do \ f2=$$(echo $$f | sed 's/\.in$$//;s/X\.Y/$(LLVM_VERSION)/'); \ echo "$$f => $$f2"; \ @@@ -286,9 -290,11 +294,12 @@@ override_dh_prep: build_do build_doc: + mkdir -p debian/man cd $(CURDIR)/docs && make -f Makefile.sphinx && make -f Makefile.sphinx man cd $(CURDIR)/clang/docs && make -f Makefile.sphinx && make -f Makefile.sphinx man + if test "$(OCAML_ENABLE)" = yes; then \ + $(PRE_PROCESS) $(MAKE) $(NJOBS) -C "$(TARGET_BUILD)/docs" ocaml_doc; \ + fi # Rename manpages d=$(CURDIR)/docs/_build/man/; \