Merge remote-tracking branch 'origin/11' into 12

debian/changelog

@@ -274,12 +274,18 @@ llvm-toolchain-snapshot (1:12~++20200715052739+d6e79e3dd6d-1~exp1) experimental;
 
 llvm-toolchain-11 (1:11.1.0-1~exp2) experimental; urgency=medium
 
+  * Fix the default binary path for scan-build-py to clang-11 (instead of
+    clang) - see scan-build-py-fix-default-bin.diff
+    tested by
+    https://github.com/opencollab/llvm-toolchain-integration-test-suite/
+
   [ Krzysztof Aleksander Pyrkosz ]
   * Add libxml2 as a dependency as it is necessary
     for llvm manifest tool (llvm-mt)
     (Closes: #990537)
+    - not really working for now
 
- -- Sylvestre Ledru <sylvestre@debian.org>  Sun, 11 Jul 2021 23:32:10 +0200
+ -- Sylvestre Ledru <sylvestre@debian.org>  Sat, 17 Jul 2021 20:13:57 +0200
 
 llvm-toolchain-11 (1:11.1.0-1~exp1) experimental; urgency=medium
 

debian/patches/scan-build-py-fix-default-bin.diff

@@ -0,0 +1,13 @@
+Index: llvm-toolchain-12-12.0.0/clang/tools/scan-build-py/libscanbuild/arguments.py
+===================================================================
+--- llvm-toolchain-12-12.0.0.orig/clang/tools/scan-build-py/libscanbuild/arguments.py
++++ llvm-toolchain-12-12.0.0/clang/tools/scan-build-py/libscanbuild/arguments.py
+@@ -250,7 +250,7 @@ def create_analyze_parser(from_build_com
+         '--use-analyzer',
+         metavar='<path>',
+         dest='clang',
+-        default='clang',
++        default='clang-11',
+         help="""'%(prog)s' uses the 'clang' executable relative to itself for
+         static analysis. One can override this behavior with this option by
+         using the 'clang' packaged with Xcode (on OS X) or from the PATH.""")

debian/patches/series

@@ -143,3 +143,4 @@ lld-use-link-atomic-i386.diff
 #bring-reporter-back.patch
 D99501-ignore-lto-auto.diff
 scan-build-py-fix-analyze-path.diff
+scan-build-py-fix-default-bin.diff