From: Raspbian automatic forward porter <root@raspbian.org>
Date: Sat, 5 Sep 2020 22:34:57 +0000 (+0100)
Subject: Merge version 1:8.0.1-9+rpi1 and 1:8.0.1-10 to produce 1:8.0.1-10+rpi1
X-Git-Tag: archive/raspbian/1%8.0.1-10+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e2ea59522cd54a1c090ce55e7744ef51e82dc4d9;p=llvm-toolchain-8.git

Merge version 1:8.0.1-9+rpi1 and 1:8.0.1-10 to produce 1:8.0.1-10+rpi1
---

e2ea59522cd54a1c090ce55e7744ef51e82dc4d9
diff --cc debian/changelog
index 6cdd05168,c555aec12..7f3fd82f3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,44 -1,16 +1,58 @@@
- llvm-toolchain-8 (1:8.0.1-9+rpi1) bullseye-staging; urgency=medium
++llvm-toolchain-8 (1:8.0.1-10+rpi1) bullseye-staging; urgency=medium
 +
 +  [changes brought forward from llvm-toolchain-3.8 1:3.8-2+rpi1 by Peter Michael Green <plugwash@raspbian.org> 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.0.1-3+rpi1 by Peter Michael Green]
 +  * Add build-conflicts on python2.7-minimal. If it's installed the build
 +    tries to use it, resulting in a failure.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Thu, 26 Mar 2020 04:12:37 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sat, 05 Sep 2020 22:34:56 +0000
++
+ llvm-toolchain-8 (1:8.0.1-10) unstable; urgency=medium
+ 
+   [ Debian Janitor ]
+   * Use secure URI in debian/watch.
+   * Move source package lintian overrides to debian/source.
+   * Rely on pre-initialized dpkg-architecture variables.
+ 
+   [ Gianfranco Costamagna ]
+   * Fix ftbfs in Ubuntu with newer gcc (use gcc-8) (Closes: #957496)
+   * debian/patches/b288d90b39f4b905c02092a9bfcfd6d78f99b191.patch:
+     - cherry-pick upstream fix for newer glibc
+ 
+  -- Gianfranco Costamagna <locutusofborg@debian.org>  Sat, 15 Aug 2020 22:34:33 +0200
  
  llvm-toolchain-8 (1:8.0.1-9) unstable; urgency=medium
  
diff --cc debian/control
index f26d942ab,ee570ab6f..a7242fb13
--- a/debian/control
+++ b/debian/control
@@@ -19,8 -19,9 +19,9 @@@ 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 [linux-any], python3-setuptools,
-     g++-8 | g++-7 | g++-6 | g++-5 | g++-4.7
+     g++-8 | g++-7 | g++-6 | g++-5 | g++-4.7,
+     gcc-8
 -Build-Conflicts: oprofile, ocaml
 +Build-Conflicts: oprofile, ocaml, python2.7-minimal
  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 9954d3183,3b6cf7d82..3809afef3
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -121,4 -144,4 +121,5 @@@ print-lldb-path.patc
  no-cgi.patch
  swig.patch
  947f9692440836dcb8d88b74b69dd379d85974ce.patch
+ b288d90b39f4b905c02092a9bfcfd6d78f99b191.patch
 +auto-1:8-3+rpi1-1a839296377e62e6071fdc0532f28cd26fa7ce7d-1555592223