From 3c340db4241842371bc0c7ca727b2cdb7c1cdec1 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 11 Jul 2021 23:51:57 +0200 Subject: [PATCH 1/2] remove comment which breaks the build --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index a2f9e619..ecd71eb6 100644 --- a/debian/control +++ b/debian/control @@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 9.0), cmake, chrpath, texinfo, sharutils, lsb-release, patchutils, diffstat, xz-utils, python3-dev, libedit-dev, libncurses5-dev, swig, python3-six, python3-sphinx (>= 1.3.6), binutils-dev, - libxml2-dev, # for llvm-mt + libxml2-dev, libjsoncpp-dev, pkg-config, lcov, procps, help2man, zlib1g-dev, g++-multilib [amd64 i386 kfreebsd-amd64 mips mips64 mips64el mipsel powerpc ppc64 s390 s390x sparc sparc64 x32], From 7968be8f04700900a1ddd500b0351dc755e0f3d6 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sat, 17 Jul 2021 20:14:53 +0200 Subject: [PATCH 2/2] * 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/ - not really working for now --- debian/changelog | 8 +++++++- debian/patches/scan-build-py-fix-default-bin.diff | 13 +++++++++++++ debian/patches/series | 1 + 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 debian/patches/scan-build-py-fix-default-bin.diff diff --git a/debian/changelog b/debian/changelog index 06aed14c..582edac3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,17 @@ 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 Sun, 11 Jul 2021 23:32:10 +0200 + -- Sylvestre Ledru Sat, 17 Jul 2021 20:13:57 +0200 llvm-toolchain-11 (1:11.1.0-1~exp1) experimental; urgency=medium diff --git a/debian/patches/scan-build-py-fix-default-bin.diff b/debian/patches/scan-build-py-fix-default-bin.diff new file mode 100644 index 00000000..681a44a6 --- /dev/null +++ b/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='', + 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.""") diff --git a/debian/patches/series b/debian/patches/series index c89297d0..09fd4ef0 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -144,3 +144,4 @@ silent-integration-test-suite-i386.diff revert-abi-change-clang.diff scan-build-py-fix-analyze-path.diff D91833-bpftrace-fix-code-gen.diff +scan-build-py-fix-default-bin.diff