From: Raspbian forward pporter Date: Sun, 8 Jul 2018 15:21:14 +0000 (+0100) Subject: Merge version 1:6.0-3+rpi1 and 1:6.0.1-2 to produce 1:6.0.1-2+rpi1 X-Git-Tag: archive/raspbian/1%6.0.1-2+rpi1^0 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=b8a299d13ea814d84ac56f946a5804b57d4b3a8c;p=llvm-toolchain-6.0.git Merge version 1:6.0-3+rpi1 and 1:6.0.1-2 to produce 1:6.0.1-2+rpi1 --- b8a299d13ea814d84ac56f946a5804b57d4b3a8c diff --cc debian/changelog index 4df6d083,344c8012..f9d81c98 --- a/debian/changelog +++ b/debian/changelog @@@ -1,34 -1,56 +1,88 @@@ - llvm-toolchain-6.0 (1:6.0-3+rpi1) buster-staging; urgency=medium ++llvm-toolchain-6.0 (1:6.0.1-2+rpi1) buster-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. + * Put commented out (by Debian not us) ocaml build-depends into build-conflicts + if they are installed it seems that the package builds the ocaml stuff and + then errors out during packaging because it's not installed to anywhere. + + [changes introduced in 1:6.0-3+rpi1 by Peter Michael Green] + * Remove debian/man in clean target. + - -- Peter Michael Green Thu, 03 May 2018 16:57:05 +0000 ++ -- Raspbian forward porter Sun, 08 Jul 2018 15:21:12 +0000 ++ + llvm-toolchain-6.0 (1:6.0.1-2) unstable; urgency=medium + + * Bump std-version to 4.1.4, no changes required. + + -- Gianfranco Costamagna Wed, 27 Jun 2018 16:24:20 +0200 + + llvm-toolchain-6.0 (1:6.0.1-1) unstable; urgency=medium + + * New stable release + + -- Sylvestre Ledru Wed, 27 Jun 2018 08:52:37 +0200 + + llvm-toolchain-6.0 (1:6.0.1~+rc3-1~exp1) experimental; urgency=medium + + * New testing release + + -- Sylvestre Ledru Fri, 15 Jun 2018 18:28:35 +0200 + + llvm-toolchain-6.0 (1:6.0.1~+rc2-1~exp1) experimental; urgency=medium + + * New testing release + * Enable WebAssembly & AVR as experimental archs (Closes: #899202) + * d/p/force-gcc-header-obj.diff Fix the detection of the objc path + + [ Gianfranco Costamagna ] + * Add ubuntu cosmic to Ubuntu supported releases + + -- Sylvestre Ledru Wed, 09 May 2018 14:23:49 +0200 + + llvm-toolchain-6.0 (1:6.0.1~+rc1-1~exp2) experimental; urgency=medium + + * Add python-yaml as dep for clang-tidy (Closes: #890514) + + [ Peter Wu ] + * Make CMake find_package(Clang) work. Fixes upstream bug + https://bugs.llvm.org/show_bug.cgi?id=37128 + - Move Clang*.cmake back to /usr/lib/llvm-X.Y/lib/cmake/clang and install a + symlink in /usr/lib/cmake/clang-X.Y. + - Ensure that the LLVM installation prefix is correctly discovered despire + symlinks (replaces fix-cmake-config-prefix.diff). + - Create /usr/lib/llvm-X.Y/bin/clang-X.Y symlink as required by + ClangTargets-relwithdebinfo.cmake. + - Remove useless LLVM_CMAKE_DIR sed command that did not match anything. + - Ignore missing binaries in ClangTargets-relwithdebinfo.cmake. + + -- Sylvestre Ledru Mon, 07 May 2018 23:27:26 +0200 + + llvm-toolchain-6.0 (1:6.0.1~+rc1-1~exp1) experimental; urgency=medium + + * New snapshot release + * Fix a typo in the debci + + -- Sylvestre Ledru Thu, 26 Apr 2018 08:02:09 +0200 llvm-toolchain-6.0 (1:6.0-3) unstable; urgency=medium diff --cc debian/control index ef1a075e,4f336068..2f3ad834 --- a/debian/control +++ b/debian/control @@@ -15,8 -15,8 +15,8 @@@ Build-Depends: debhelper (>= 9.0), flex # ocaml-findlib [amd64 arm64 armel armhf i386 ppc64el s390x], # libctypes-ocaml-dev [amd64 arm64 armel armhf i386 ppc64el s390x], # dh-ocaml [amd64 arm64 armel armhf i386 ppc64el s390x], -Build-Conflicts: oprofile, ocaml, libllvm-3.8-ocaml-dev, libllvm-3.9-ocaml-dev +Build-Conflicts: oprofile, ocaml, libllvm-3.8-ocaml-dev, libllvm-3.9-ocaml-dev, ocaml-nox, ocaml-findlib, libctypes-ocaml-dev, dh-ocaml - Standards-Version: 4.1.3 + Standards-Version: 4.1.4 Homepage: https://www.llvm.org/ Vcs-Git: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain.git -b 6.0 Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/6.0 diff --cc debian/patches/series index ce2f340a,9d10f728..dc880db7 --- a/debian/patches/series +++ b/debian/patches/series @@@ -48,7 -49,8 +49,9 @@@ silent-llvm-isel-fuzzer.dif test-keep-alive.diff sparc64-add-missing-tls-get-addr.diff remove-test-freezing.diff - install-lldb-sb-headers.patch + # Disable as it was merged upstream + #install-lldb-sb-headers.patch 0048-Set-html_static_path-_static-everywhere.patch 0049-Use-Debian-provided-MathJax-everywhere.patch + ubuntu-cosmic-support.patch +auto-1:5.0~+rc2-1+rpi1-d8bb5e17a1c124bfc65bd4da3d5bad2318b86155-1504768094