Merge remote-tracking branch 'origin/9' into snapshot

debian/changelog

@@ -4,6 +4,12 @@ llvm-toolchain-snapshot (1:10~svn366440-1~exp1) experimental; urgency=medium
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 18 Jul 2019 18:58:32 +0200
 
+llvm-toolchain-9 (1:9~svn366428-1) unstable; urgency=medium
+
+  * New branch (9)
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 18 Jul 2019 16:54:14 +0200
+
 llvm-toolchain-snapshot (1:9~svn366022-1~exp1) experimental; urgency=medium
 
   * New snapshot release
@@ -26,7 +32,7 @@ llvm-toolchain-snapshot (1:9~svn366022-1~exp1) experimental; urgency=medium
   * Ship libclang-cpp1-9 as a new package
   * Ship python3-lldb-9 as a new package
 
- -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 14 Jul 2019 20:23:25 +0200
+ -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 18 Jul 2019 15:52:37 +0200
 
 llvm-toolchain-snapshot (1:9~svn364913-1~exp1) experimental; urgency=medium
 
@@ -170,6 +176,19 @@ llvm-toolchain-snapshot (1:9~svn351375-1~exp1) experimental; urgency=medium
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Wed, 16 Jan 2019 21:59:29 +0100
 
+llvm-toolchain-8 (1:8.0.1~+rc4-2) unstable; urgency=medium
+
+  * Compile against Python 3
+    (Closes: #931029)
+
+ -- Christian Biesinger <cbiesinger@google.com>  Thu, 18 Jul 2019 14:13:56 -0500
+
+llvm-toolchain-8 (1:8.0.1~+rc4-1) unstable; urgency=medium
+
+  * New snapshot release
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 11 Jul 2019 08:39:38 +0200
+
 llvm-toolchain-8 (1:8.0.1~+rc3-1) unstable; urgency=medium
 
   * New testing release in unstable

debian/control

@@ -1,4 +1,4 @@
-Source: llvm-toolchain-snapshot
+Source: llvm-toolchain-9
 Section: devel
 Priority: optional
 Rules-Requires-Root: no
@@ -7,12 +7,12 @@ Uploaders: Sylvestre Ledru <sylvestre@debian.org>
 Build-Depends: debhelper (>= 9.0), cmake, chrpath, texinfo, sharutils,
     libffi-dev (>= 3.0.9),
     lsb-release, patchutils, diffstat, xz-utils, python3-dev,
-    libedit-dev, libncurses5-dev, swig, python-six, python-sphinx (>= 1.3.6),
+    libedit-dev, libncurses5-dev, swig, python3-six, python3-sphinx (>= 1.3.6),
     binutils-dev,
     libjsoncpp-dev, pkg-config,
     lcov, procps, help2man, zlib1g-dev,
     g++-multilib [amd64 i386 kfreebsd-amd64 mips mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32],
-    libjs-mathjax, python-recommonmark,
+    libjs-mathjax, python3-recommonmark,
     doxygen, gfortran,
     ocaml-nox [amd64 arm64 armhf i386 ppc64el s390x],
     ocaml-findlib [amd64 arm64 armhf i386 ppc64el s390x],
@@ -22,8 +22,8 @@ Build-Depends: debhelper (>= 9.0), cmake, chrpath, texinfo, sharutils,
 Build-Conflicts: oprofile, ocaml, libllvm-3.8-ocaml-dev, libllvm-3.9-ocaml-dev
 Standards-Version: 4.2.1
 Homepage: https://www.llvm.org/
-Vcs-Git: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain.git -b snapshot
-Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/snapshot
+Vcs-Git: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain.git -b 9
+Vcs-Browser: https://salsa.debian.org/pkg-llvm-team/llvm-toolchain/tree/9
 
 # ------------- clang -------------
 
@@ -33,7 +33,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${dep:devlibs},
  ${dep:devlibs-objc}, libclang-common-10-dev (= ${binary:Version}),
  libclang1-10 (= ${binary:Version}), libc6-dev, binutils
 Provides: c-compiler, objc-compiler, c++-compiler
-Recommends: llvm-10-dev, python, libomp-10-dev
+Recommends: llvm-10-dev, python3, libomp-10-dev
 Suggests: clang-10-doc
 Description: C, C++ and Objective-C compiler
  Clang project is a C, C++, Objective C and Objective C++ front-end
@@ -46,7 +46,7 @@ Description: C, C++ and Objective-C compiler
 Package: clang-tools-10
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, clang-10 (= ${binary:Version}),
- python
+ python3
 Description: clang-based tools for C/C++ developments
  Clang project is a C, C++, Objective C and Objective C++ front-end
  based on the LLVM compiler. Its goal is to offer a replacement to the
@@ -60,7 +60,7 @@ Description: clang-based tools for C/C++ developments
 
 Package: clang-format-10
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, python,
+Depends: ${shlibs:Depends}, ${misc:Depends}, python3,
  libllvm10 (= ${binary:Version})
 Description: Tool to format C/C++/Obj-C code
  Clang-format is both a library and a stand-alone tool with the goal of
@@ -76,9 +76,9 @@ Description: Tool to format C/C++/Obj-C code
 
 Package: clang-tidy-10
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, python,
+Depends: ${shlibs:Depends}, ${misc:Depends}, python3,
  libllvm10 (= ${binary:Version}), libclang-common-10-dev,
- clang-tools-10, python-yaml
+ clang-tools-10, python3-yaml
 Replaces: clang-modernize-10
 Breaks: clang-modernize-10
 Description: clang-based C++ linter tool
@@ -200,7 +200,7 @@ Description: Library for coverage-guided fuzz testing
 Package: python-clang-10
 Section: python
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, python
+Depends: ${shlibs:Depends}, ${misc:Depends}, python3
 Replaces: python-clang-3.10, python-clang-3.10, python-clang-x.y
 Breaks: python-clang-3.10, python-clang-3.10
 Conflicts: python-clang-x.y
@@ -316,8 +316,8 @@ Description: Modular compiler and toolchain technologies, libraries and headers
 
 Package: llvm-10-tools
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, python,
- python-pygments, python-yaml,
+Depends: ${shlibs:Depends}, ${misc:Depends}, python3,
+ python3-pygments, python3-yaml,
  llvm-10-dev (= ${binary:Version})
 Description: Modular compiler and toolchain technologies, tools
  LLVM is a collection of libraries and tools that make it easy to build
@@ -469,7 +469,7 @@ Package: python-lldb-10
 Section: python
 Architecture: amd64 arm64 armel armhf i386 mips mipsel mips64el ppc64el kfreebsd-amd64 kfreebsd-i386 s390 sparc hppa m610k sh4 x32
 # ia64 hurd powerpc powerpcspe ppc64 alpha s390x sparc64 have been removed
-Depends: ${shlibs:Depends}, ${misc:Depends}, python, python-six
+Depends: ${shlibs:Depends}, ${misc:Depends}, python3, python3-six
 Conflicts: python-lldb-3.10, python-lldb-3.10, python-lldb-x.y
 Replaces: python-lldb-x.y
 Provides: python-lldb-x.y

debian/patches/0050-Remove-explicit-python-version-list.patch

@@ -0,0 +1,28 @@
+From 61caa3a0c61fd4f2a049e9a14b5f4f74354dbb29 Mon Sep 17 00:00:00 2001
+From: Christian Biesinger <cbiesinger@chromium.org>
+Date: Thu, 18 Jul 2019 14:52:36 -0500
+Subject: [PATCH] Remove explicit python version list
+
+This is required to make -DPYTHON_EXECUTABLE work correctly
+---
+ llvm/CMakeLists.txt | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 81c2bab39ec..e2222d42aae 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -603,10 +603,6 @@ message(STATUS "LLVM default target triple: ${LLVM_DEFAULT_TARGET_TRIPLE}")
+ 
+ include(HandleLLVMOptions)
+ 
+-# Verify that we can find a Python 2 interpreter.  Python 3 is unsupported.
+-# FIXME: We should support systems with only Python 3, but that requires work
+-# on LLDB.
+-set(Python_ADDITIONAL_VERSIONS 2.7)
+ include(FindPythonInterp)
+ if( NOT PYTHONINTERP_FOUND )
+   message(FATAL_ERROR
+-- 
+2.22.0.510.g264f2c817a-goog
+

debian/patches/series

@@ -124,3 +124,7 @@ kfreebsd/tools_llvm-shlib_CMakeLists.txt.diff
 
 930008-arm.diff
 bootstrap-fix-include-next.diff
+
+# Python 3
+0050-Remove-explicit-python-version-list.patch
+

debian/rules

@@ -40,7 +40,7 @@ LDFLAGS_EXTRA =
 CXXFLAGS_EXTRA =
 CFLAGS_EXTRA =
 CONFIGURE_EXTRA =
-CMAKE_EXTRA =
+CMAKE_EXTRA = -DPYTHON_EXECUTABLE=/usr/bin/python3
 
 BASE_PATH	:= $(CURDIR)
 LIBCXX_EXCEPTIONS :=ON