From 6de8a1471f30de7084dc3d3a97c7b4352c8f6b8c Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Thu, 3 Oct 2019 18:15:14 +0200
Subject: [PATCH] Remove the lit-cpuid references from LLVMExports.cmake. It is
 provided by lldb and we don't want to add this as a new dep from llvm-dev
 (Closes: #941082 #941306)

---
 debian/changelog                              |  9 +++++++++
 debian/lldb-X.Y.install.in                    |  2 --
 debian/patches/disable-lit-cpuid-install.diff | 10 ++++++++++
 debian/patches/series                         |  1 +
 4 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 debian/patches/disable-lit-cpuid-install.diff

diff --git a/debian/changelog b/debian/changelog
index fcf4c398..5f7d3b68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+llvm-toolchain-9 (1:9-2) unstable; urgency=medium
+
+  * /disable-lit-cpuid-install.diff: Remove the lit-cpuid from the llvm
+    install.
+    It is provided by lldb and we don't want to add this as a new
+    dep from llvm-dev (Closes: #941082 #941306)
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 03 Oct 2019 18:14:21 +0200
+
 llvm-toolchain-9 (1:9-1) unstable; urgency=medium
 
   * New release
diff --git a/debian/lldb-X.Y.install.in b/debian/lldb-X.Y.install.in
index d6ed3057..eff6bd03 100644
--- a/debian/lldb-X.Y.install.in
+++ b/debian/lldb-X.Y.install.in
@@ -2,7 +2,6 @@ usr/lib/llvm-@LLVM_VERSION@/bin/lldb*
 usr/lib/llvm-@LLVM_VERSION@/bin/lldb-mi*
 usr/lib/llvm-@LLVM_VERSION@/bin/lldb-server*
 usr/lib/llvm-@LLVM_VERSION@/bin/lldb-argdumper
-usr/lib/llvm-@LLVM_VERSION@/bin/lit-cpuid
 
 usr/bin/lldb-@LLVM_VERSION@*
 usr/bin/lldb-server-@LLVM_VERSION@*
@@ -10,4 +9,3 @@ usr/bin/lldb-mi-@LLVM_VERSION@*
 usr/bin/lldb-argdumper-@LLVM_VERSION@
 usr/bin/lldb-vscode-@LLVM_VERSION@
 usr/bin/lldb-instr-@LLVM_VERSION@
-usr/bin/lit-cpuid-@LLVM_VERSION@
diff --git a/debian/patches/disable-lit-cpuid-install.diff b/debian/patches/disable-lit-cpuid-install.diff
new file mode 100644
index 00000000..9a4f7312
--- /dev/null
+++ b/debian/patches/disable-lit-cpuid-install.diff
@@ -0,0 +1,10 @@
+Index: llvm-toolchain-9-9/lldb/utils/lit-cpuid/CMakeLists.txt
+===================================================================
+--- llvm-toolchain-9-9.orig/lldb/utils/lit-cpuid/CMakeLists.txt
++++ llvm-toolchain-9-9/lldb/utils/lit-cpuid/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-add_llvm_utility(lit-cpuid
++add_lldb_executable(lit-cpuid
+   lit-cpuid.cpp
+   )
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 4b2f3e78..e31d8191 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -131,3 +131,4 @@ clang-riscv64-rv64gc.diff
 
 #try-to-unbreak-thinlto.diff
 D67877.patch
+disable-lit-cpuid-install.diff