From 195756998168e0291d986298c2435b07ddf293f0 Mon Sep 17 00:00:00 2001
From: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
Date: Tue, 21 Jan 2020 13:07:08 +0100
Subject: [PATCH] Add missing runtime dependency and add fix for lldb -P usage

---
 debian/changelog                     |  7 +++++++
 debian/control                       |  2 +-
 debian/patches/print-lldb-path.patch | 18 ++++++++++++++++++
 debian/patches/series                |  1 +
 4 files changed, 27 insertions(+), 1 deletion(-)
 create mode 100644 debian/patches/print-lldb-path.patch

diff --git a/debian/changelog b/debian/changelog
index ac273ebe..7d4c1f80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+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
 
   * Team upload.
diff --git a/debian/control b/debian/control
index ab885fd1..c99bb96e 100644
--- a/debian/control
+++ b/debian/control
@@ -327,7 +327,7 @@ Package: llvm-9-dev
 Architecture: any
 Depends: ${shlibs:Depends}, libffi-dev (>= 3.0.9), ${misc:Depends},
  llvm-9 (= ${binary:Version}), libllvm9 (= ${binary:Version}), libtinfo-dev,
- llvm-9-tools (= ${binary:Version}), libz3-dev
+ llvm-9-tools (= ${binary:Version}), libclang-cpp9 (= ${binary:Version}), libz3-dev
 Description: Modular compiler and toolchain technologies, libraries and headers
  LLVM is a collection of libraries and tools that make it easy to build
  compilers, optimizers, just-in-time code generators, and many other
diff --git a/debian/patches/print-lldb-path.patch b/debian/patches/print-lldb-path.patch
new file mode 100644
index 00000000..4d255f85
--- /dev/null
+++ b/debian/patches/print-lldb-path.patch
@@ -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
+ }
diff --git a/debian/patches/series b/debian/patches/series
index a22aeb16..288ba2b2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -140,3 +140,4 @@ no-z3.patch
 # bug #946874
 D71028-mips-rust-test.diff
 python3-shebang.patch
+print-lldb-path.patch