From: Peter Michael Green Date: Sun, 3 Nov 2019 04:48:00 +0000 (+0000) Subject: Manual merge of version 1:8.0.1~+rc4-1+rpi1 and 1:8.0.1-3 to produce 1:8.0.1-3+rpi1 X-Git-Tag: archive/raspbian/1%8.0.1-3+rpi1~2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=11f4ade7ce59de63e35abab3af22d2338c03e461;p=llvm-toolchain-8.git Manual merge of version 1:8.0.1~+rc4-1+rpi1 and 1:8.0.1-3 to produce 1:8.0.1-3+rpi1 --- 11f4ade7ce59de63e35abab3af22d2338c03e461 diff --cc debian/changelog index 3d8d7ddc9,9cb6a6164..4cd77355f --- a/debian/changelog +++ b/debian/changelog @@@ -1,44 -1,35 +1,77 @@@ - llvm-toolchain-8 (1:8.0.1~+rc4-1+rpi1) bullseye-staging; urgency=medium ++llvm-toolchain-8 (1:8.0.1-3+rpi1) bullseye-staging; urgency=medium + + [changes brought forward from llvm-toolchain-3.8 1:3.8-2+rpi1 by Peter Michael Green at Sat, 14 May 2016 21:43:35 +0000] + * 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). + * Add -DCOMPILER_RT_BUILD_BUILTINS=OFF to disable parts of compiler-rt that + are broken on lower arm architectures. + + [changes introduced in llvm-toolchain-3.9 1:3.9.1-1 by Peter Michael Green] + * disable testsuite (using a method that is hopefully less likely to cause diff conflicts than previously). + * Remove -march=armv7-a in compiler-rt/cmake/config-ix-base.cmake + * Clean up debian/usr in clean target. + * Clean up clang/tools/*-3.9 in clean target. + * Clean up stray *3.9.vim files + * Clean up clang/tools/scan-build/man/scan-build-3.9.1 and utils/vim/llvm-3.9-vimrc + * Clean up debian/*.install + + [changes introduced in llvm-toolchain-6.0 1:6.0-1+rpi1 by Peter michael green] + * create build-llvm/docs/ocamldoc/html/ so the install target doesn't complain + about it not existing. + * clean up more crap left behind by build process. + + [changes introduced in llvm-toolchain-6.0 1:6.0-3+rpi1 by Peter Michael Green] + * Remove debian/man in clean target. + + [changes introduced in llvm-toolchain-7 1:7-6+rpi1 by Peter Michael Green] + * Use libatomic on armhf + * Set cmake/config.guess.hack back to mode 644 in clean target to keep + git/dgit happy. + * Yet more clean target fixes. + + [changes introduced in llvm-toolchain-7 1:7.0.1-1+rpi2 by Peter Michael Green] + * Change triplet in debian/rules to use armv6k rather than armv7l + + [changes introduced in llvm-toolchain-8 1:8-3+rpi1 by Peter Michael Green] + * Add build-conflicts on python3-sphinx, if it's installed the build tries + to use it and finds missing extensions. + - -- Raspbian forward porter Thu, 01 Aug 2019 21:46:44 +0000 ++ -- Peter Michael Green Sun, 03 Nov 2019 04:47:04 +0000 ++ + llvm-toolchain-8 (1:8.0.1-3) unstable; urgency=medium + + * llvm-tools: depend on python2 packages too, the move to python3 was + premature and broke opt-viewer.py + + -- Gianfranco Costamagna Wed, 07 Aug 2019 15:11:36 +0200 + + llvm-toolchain-8 (1:8.0.1-2) unstable; urgency=medium + + [ Gianfranco Costamagna ] + * clangd: Fix breaks+replaces missing epoch (Closes: #934016) + * Add python to testsuite, still required by some test + + -- Gianfranco Costamagna Tue, 06 Aug 2019 09:36:11 +0200 + + llvm-toolchain-8 (1:8.0.1-1) unstable; urgency=medium + + * New stable release + * Ship python3-lldb-8 as a new package + * Ship clangd-8 as a new package (Closes: #932432) + + [ Gianfranco Costamagna ] + * Fixed wrong shlib generation of libomp5 library + + -- Sylvestre Ledru Sat, 03 Aug 2019 11:44:29 +0200 + + llvm-toolchain-8 (1:8.0.1~+rc4-2) unstable; urgency=medium + + * Compile against Python 3 + (Closes: #931029) + + -- Christian Biesinger Thu, 18 Jul 2019 14:13:56 -0500 llvm-toolchain-8 (1:8.0.1~+rc4-1) unstable; urgency=medium diff --cc debian/control index 976b7d890,93ea99979..7b52af968 --- a/debian/control +++ b/debian/control @@@ -19,7 -19,7 +19,7 @@@ Build-Depends: debhelper (>= 9.0), cmak libctypes-ocaml-dev [amd64 arm64 armhf i386 ppc64el s390x], dh-exec, dh-ocaml [amd64 arm64 armhf i386 ppc64el s390x], libpfm4-dev - Build-Conflicts: oprofile, ocaml, libllvm-3.8-ocaml-dev, libllvm-3.9-ocaml-dev, python3-sphinx -Build-Conflicts: oprofile, ocaml ++Build-Conflicts: oprofile, ocaml, python3-sphinx Standards-Version: 4.2.1 Homepage: https://www.llvm.org/ Vcs-Git: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain.git -b 8 diff --cc debian/patches/series index c31f86f26,29a54464f..a74fe55cf --- a/debian/patches/series +++ b/debian/patches/series @@@ -112,5 -133,8 +112,7 @@@ OpenCL-Change-type-of-block-pointer-for OpenCL-Simplify-LLVM-IR-generated-for-OpenCL-blocks.patch OpenCL-Fix-assertion-due-to-blocks.patch ubuntu-eoan-distro.patch - 930008-arm.diff - + # Python 3 + 0050-Remove-explicit-python-version-list.patch +auto-1:8-3+rpi1-1a839296377e62e6071fdc0532f28cd26fa7ce7d-1555592223 diff --cc debian/rules index b2dcf1f1a,7d368bb35..ef46a2178 --- a/debian/rules +++ b/debian/rules @@@ -40,7 -40,7 +40,7 @@@ LDFLAGS_EXTRA CXXFLAGS_EXTRA = CFLAGS_EXTRA = CONFIGURE_EXTRA = - CMAKE_EXTRA = -DCOMPILER_RT_BUILD_BUILTINS=OFF -CMAKE_EXTRA = -DPYTHON_EXECUTABLE=/usr/bin/python3 ++CMAKE_EXTRA = -DPYTHON_EXECUTABLE=/usr/bin/python3 -DCOMPILER_RT_BUILD_BUILTINS=OFF BASE_PATH := $(CURDIR) LIBCXX_EXCEPTIONS :=ON