From 4aedcbd2263707b8113b7081fdbcc236c751ff06 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Tue, 22 Jun 2021 23:13:16 +0200 Subject: [PATCH] Fix the path to analyze-{cc,c++} for scan-build-py with --intercept-first (scan-build-py-fix-analyze-path.diff) --- debian/changelog | 2 ++ .../patches/scan-build-py-fix-analyze-path.diff | 15 +++++++++++++++ debian/patches/series | 1 + debian/prepare-new-release.sh | 2 +- 4 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 debian/patches/scan-build-py-fix-analyze-path.diff diff --git a/debian/changelog b/debian/changelog index 4e0ccc6e..52685b23 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ llvm-toolchain-snapshot (1:13~++20210622094539+d919b73564fa-1~exp1) UNRELEASED; * Refresh the lib of symbols in libomp * As scan-build-py is installed by default ( https://reviews.llvm.org/D104138 ) update of the code + * Fix the path to analyze-{cc,c++} for scan-build-py with + --intercept-first (scan-build-py-fix-analyze-path.diff) -- Sylvestre Ledru Sat, 08 May 2021 13:12:43 +0200 diff --git a/debian/patches/scan-build-py-fix-analyze-path.diff b/debian/patches/scan-build-py-fix-analyze-path.diff new file mode 100644 index 00000000..10374e55 --- /dev/null +++ b/debian/patches/scan-build-py-fix-analyze-path.diff @@ -0,0 +1,15 @@ +Index: llvm-toolchain-snapshot_13~++20210622111349+b259740801d3/clang/tools/scan-build-py/lib/libscanbuild/analyze.py +=================================================================== +--- llvm-toolchain-snapshot_13~++20210622111349+b259740801d3.orig/clang/tools/scan-build-py/lib/libscanbuild/analyze.py ++++ llvm-toolchain-snapshot_13~++20210622111349+b259740801d3/clang/tools/scan-build-py/lib/libscanbuild/analyze.py +@@ -39,8 +39,8 @@ from libscanbuild.shell import decode + + __all__ = ['scan_build', 'analyze_build', 'analyze_compiler_wrapper'] + +-COMPILER_WRAPPER_CC = 'analyze-cc' +-COMPILER_WRAPPER_CXX = 'analyze-c++' ++COMPILER_WRAPPER_CC = '/usr/lib/llvm-13/libexec/analyze-cc' ++COMPILER_WRAPPER_CXX = '/usr/lib/llvm-13/libexec/analyze-c++' + + CTU_EXTDEF_MAP_FILENAME = 'externalDefMap.txt' + CTU_TEMP_DEFMAP_FOLDER = 'tmpExternalDefMaps' diff --git a/debian/patches/series b/debian/patches/series index 556a66ad..13326845 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -139,3 +139,4 @@ libcxx-armhf-ftbfs.diff lld-use-link-atomic-i386.diff lower-python-dep.diff revert-D94333-m86k-link-issue.diff +scan-build-py-fix-analyze-path.diff diff --git a/debian/prepare-new-release.sh b/debian/prepare-new-release.sh index 9e8a74cd..51c8e8bc 100644 --- a/debian/prepare-new-release.sh +++ b/debian/prepare-new-release.sh @@ -6,7 +6,7 @@ TARGET_VERSION_2=13_0 ORIG_VERSION_3=120 TARGET_VERSION_3=130 -LIST=`ls debian/control debian/orig-tar.sh debian/rules debian/patches/clang-analyzer-force-version.diff debian/patches/clang-format-version.diff debian/patches/python-clangpath.diff debian/patches/scan-build-clang-path.diff debian/patches/lldb-libname.diff debian/patches/fix-scan-view-path.diff debian/patches/lldb/lldb-addversion-suffix-to-llvm-server-exec.patch debian/patches/clang-tidy-run-bin.diff debian/patches/fix-scan-view-path.diff debian/README debian/patches/clang-analyzer-force-version.diff debian/patches/clang-tidy-run-bin.diff debian/tests/control debian/unpack.sh debian/tests/cmake-test` +LIST=`ls debian/control debian/orig-tar.sh debian/rules debian/patches/clang-analyzer-force-version.diff debian/patches/clang-format-version.diff debian/patches/python-clangpath.diff debian/patches/scan-build-clang-path.diff debian/patches/lldb-libname.diff debian/patches/fix-scan-view-path.diff debian/patches/lldb/lldb-addversion-suffix-to-llvm-server-exec.patch debian/patches/clang-tidy-run-bin.diff debian/patches/fix-scan-view-path.diff debian/README debian/patches/clang-analyzer-force-version.diff debian/patches/clang-tidy-run-bin.diff debian/tests/control debian/unpack.sh debian/tests/cmake-test debian/patches/scan-build-py-fix-analyze-path.diff` for F in $LIST; do sed -i -e "s|$ORIG_VERSION_3|$TARGET_VERSION_3|g" $F sed -i -e "s|$ORIG_VERSION_2|$TARGET_VERSION_2|g" $F