Fix the path to analyze-{cc,c++} for scan-build-py with --intercept-first (scan-build-py-fix-analyze-path.diff)

This commit is contained in:
Sylvestre Ledru 2021-06-22 23:13:16 +02:00
parent e8602eee5c
commit 4aedcbd226
4 changed files with 19 additions and 1 deletions

2
debian/changelog vendored
View File

@ -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 <sylvestre@debian.org> Sat, 08 May 2021 13:12:43 +0200

View File

@ -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'

View File

@ -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

View File

@ -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