From 5a7d283d4e00bc4822c7b0226e593c344c8f6050 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Tue, 15 Jan 2019 21:47:27 +0100
Subject: [PATCH 1/2] add a test for bug
 https://bugs.llvm.org/show_bug.cgi\?id\=40059

---
 debian/qualify-clang.sh | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/debian/qualify-clang.sh b/debian/qualify-clang.sh
index 85b8eca4..5b6765fb 100755
--- a/debian/qualify-clang.sh
+++ b/debian/qualify-clang.sh
@@ -34,6 +34,13 @@ if llvm-config-$VERSION --cxxflags | grep " \-W"; then
     exit 1
 fi
 
+# Test https://bugs.llvm.org/show_bug.cgi?id=40059
+nm /usr/lib/llvm-$VERSION/lib/libLLVMBitWriter.a &> foo.log
+if grep "File format not recognized" foo.log; then
+    echo "nm libLLVMBitWriter.a contains 'File format not recognized'"
+    exit 1
+fi
+
 echo '#include <stdlib.h>
 int main() {
   char *x = (char*)malloc(10 * sizeof(char*));

From 33b97f7ef073ea7ad2920a3ea2bf681cf87e33a8 Mon Sep 17 00:00:00 2001
From: Sylvestre Ledru <sylvestre@debian.org>
Date: Thu, 17 Jan 2019 10:32:17 +0100
Subject: [PATCH 2/2] Because more and more tools in clang-tools are in python,
 add the dependency

---
 debian/changelog | 9 +++++++++
 debian/control   | 3 ++-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 62f34034..ad181fd8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,15 @@
 llvm-toolchain-7 (1:7.0.1-5) unstable; urgency=medium
 
+<<<<<<<
   * Add 'Rules-Requires-Root: no' in debian/control
+=======
+  * llvm-7-examples: Force the same version of llvm-7-dev to mitigate
+    a debci issue
+    https://ci.debian.net/data/autopkgtest/unstable/amd64/l/llvm-toolchain-7/1635547/log.gz
+  * Add 'Rules-Requires-Root: no' in debian/control
+  * Because more and more tools in clang-tools are in python, add
+    the dependency
+>>>>>>>
 
  -- Sylvestre Ledru <sylvestre@debian.org>  Fri, 04 Jan 2019 16:00:41 +0100
 
diff --git a/debian/control b/debian/control
index 93e500b5..7d6e4a16 100644
--- a/debian/control
+++ b/debian/control
@@ -44,7 +44,8 @@ Description: C, C++ and Objective-C compiler
 
 Package: clang-tools-7
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, clang-7 (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, clang-7 (= ${binary:Version}),
+ python
 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