Merge branch '9' into snapshot

This commit is contained in:
Gianfranco Costamagna 2020-01-22 14:28:52 +01:00
commit 10643a5129
4 changed files with 27 additions and 1 deletions

7
debian/changelog vendored
View File

@ -156,6 +156,13 @@ llvm-toolchain-snapshot (1:10~svn366440-1~exp1) experimental; urgency=medium
-- Sylvestre Ledru <sylvestre@debian.org> Thu, 18 Jul 2019 18:58:32 +0200 -- Sylvestre Ledru <sylvestre@debian.org> Thu, 18 Jul 2019 18:58:32 +0200
llvm-toolchain-9 (1:9.0.1-7) UNRELEASED; urgency=medium
* Add dependency on libclang-cpp-9 from llvm-9-dev (Closes: #946761)
* fix lldb-9 -P path print (Closes: #945445)
-- Gianfranco Costamagna <locutusofborg@debian.org> Tue, 21 Jan 2020 13:05:06 +0100
llvm-toolchain-9 (1:9.0.1-6) unstable; urgency=medium llvm-toolchain-9 (1:9.0.1-6) unstable; urgency=medium
* Team upload. * Team upload.

2
debian/control vendored
View File

@ -325,7 +325,7 @@ Package: llvm-10-dev
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, libffi-dev (>= 3.0.10), ${misc:Depends}, Depends: ${shlibs:Depends}, libffi-dev (>= 3.0.10), ${misc:Depends},
llvm-10 (= ${binary:Version}), libllvm10 (= ${binary:Version}), libtinfo-dev, llvm-10 (= ${binary:Version}), libllvm10 (= ${binary:Version}), libtinfo-dev,
llvm-10-tools (= ${binary:Version}), libz3-dev llvm-10-tools (= ${binary:Version}), libclang-cpp10 (= ${binary:Version}), libz3-dev
Description: Modular compiler and toolchain technologies, libraries and headers Description: Modular compiler and toolchain technologies, libraries and headers
LLVM is a collection of libraries and tools that make it easy to build LLVM is a collection of libraries and tools that make it easy to build
compilers, optimizers, just-in-time code generators, and many other compilers, optimizers, just-in-time code generators, and many other

18
debian/patches/print-lldb-path.patch vendored Normal file
View File

@ -0,0 +1,18 @@
Author: Gianfranco Costamagna <locutusofborg@debian.org>
Last-Update: 2020-01-21
Index: llvm-toolchain-9-9.0.1/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
===================================================================
--- llvm-toolchain-9-9.0.1.orig/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
+++ llvm-toolchain-9-9.0.1/lldb/source/Plugins/ScriptInterpreter/Python/ScriptInterpreterPython.cpp
@@ -337,8 +337,8 @@
llvm::sys::path::append(path, style, LLDB_PYTHON_RELATIVE_LIBDIR);
#else
llvm::sys::path::append(path, style,
- "python" + llvm::Twine(PY_MAJOR_VERSION) + "." +
- llvm::Twine(PY_MINOR_VERSION),
+ "python" /*+ llvm::Twine(PY_MAJOR_VERSION)*/ + "3"
+ /*llvm::Twine(PY_MINOR_VERSION)*/,
"site-packages");
#endif
}

View File

@ -136,3 +136,4 @@ disable-fuzzer-compiler-rt.diff
no-z3.patch no-z3.patch
python3-shebang.patch python3-shebang.patch
print-lldb-path.patch