diff --git a/debian/changelog b/debian/changelog index c1a3821c..301cdaae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +llvm-toolchain-9 (1:9~svn370077-1~exp1) UNRELEASED; urgency=medium + + * experimental New snapshot release + * remove 0050-Remove-explicit-python-version-list.patch + bug-43011-mips.diff as they are merged upstream + + -- Sylvestre Ledru Tue, 27 Aug 2019 23:38:11 +0200 + llvm-toolchain-9 (1:9~+rc2-1~exp2) experimental; urgency=medium * Try to fix the mips* ftbfs diff --git a/debian/patches/0050-Remove-explicit-python-version-list.patch b/debian/patches/0050-Remove-explicit-python-version-list.patch deleted file mode 100644 index ecab55e9..00000000 --- a/debian/patches/0050-Remove-explicit-python-version-list.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 61caa3a0c61fd4f2a049e9a14b5f4f74354dbb29 Mon Sep 17 00:00:00 2001 -From: Christian Biesinger -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(-) - -Index: llvm-toolchain-9_9~svn366428/CMakeLists.txt -=================================================================== ---- llvm-toolchain-9_9~svn366428.orig/CMakeLists.txt -+++ llvm-toolchain-9_9~svn366428/CMakeLists.txt -@@ -643,7 +643,7 @@ option(LLVM_ENABLE_PLUGINS "Enable plugi - include(HandleLLVMOptions) - - # We support both Python 2 and 3. --set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5 2.7) -+set(Python_ADDITIONAL_VERSIONS 3.7 3.6 3.5) - include(FindPythonInterp) - if( NOT PYTHONINTERP_FOUND ) - message(FATAL_ERROR diff --git a/debian/patches/bug-43011-mips.diff b/debian/patches/bug-43011-mips.diff deleted file mode 100644 index 20933483..00000000 --- a/debian/patches/bug-43011-mips.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: llvm-toolchain-9-9~+rc1/libcxx/include/__locale -=================================================================== ---- llvm-toolchain-9-9~+rc1.orig/libcxx/include/__locale -+++ llvm-toolchain-9-9~+rc1/libcxx/include/__locale -@@ -409,7 +409,7 @@ public: - static const mask xdigit = _ISxdigit; - static const mask blank = _ISblank; - #if defined(__mips__) -- static const mask __regex_word = static_cast(_ISbit(15)); -+ static const mask __regex_word = static_cast(_ISbit(15)); - #else - static const mask __regex_word = 0x80; - #endif diff --git a/debian/patches/series b/debian/patches/series index 04236227..76eeffc0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -126,10 +126,6 @@ kfreebsd/tools_llvm-shlib_CMakeLists.txt.diff 930008-arm.diff bootstrap-fix-include-next.diff -# Python 3 -0050-Remove-explicit-python-version-list.patch - # riscv64 clang-riscv64-multiarch.diff clang-riscv64-rv64gc.diff -bug-43011-mips.diff