From eda4bcc85d8a6bd24cf77690ac808ee47eafc3f2 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Wed, 12 Jan 2022 22:09:12 +0100 Subject: [PATCH] fix the patch --- debian/patches/on-the-fly/use-scan-build-runtimes.diff | 6 +++--- debian/rules | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/patches/on-the-fly/use-scan-build-runtimes.diff b/debian/patches/on-the-fly/use-scan-build-runtimes.diff index d5550acc..de54eab5 100644 --- a/debian/patches/on-the-fly/use-scan-build-runtimes.diff +++ b/debian/patches/on-the-fly/use-scan-build-runtimes.diff @@ -9,9 +9,9 @@ Index: llvm-toolchain-snapshot_14~++20220105111900+cdbad62c526c/clang/CMakeLists - -DCMAKE_CXX_COMPILER=${LLVM_RUNTIME_OUTPUT_INTDIR}/${CXX_COMPILER} - -DCMAKE_C_COMPILER=${LLVM_RUNTIME_OUTPUT_INTDIR}/${C_COMPILER} - -DCMAKE_ASM_COMPILER=${LLVM_RUNTIME_OUTPUT_INTDIR}/${C_COMPILER} -+ -DCMAKE_CXX_COMPILER=/usr/share/clang/scan-build-${LLVM_PACKAGE_VERSION}/libexec/c++-analyzer -+ -DCMAKE_C_COMPILER=/usr/share/clang/scan-build-${LLVM_PACKAGE_VERSION}/libexec/ccc-analyzer -+ -DCMAKE_ASM_COMPILER=/usr/share/clang/scan-build-${LLVM_PACKAGE_VERSION}/libexec/ccc-analyzer ++ -DCMAKE_CXX_COMPILER=/usr/share/clang/scan-build-${CLANG_VERSION_MAJOR}/libexec/c++-analyzer ++ -DCMAKE_C_COMPILER=/usr/share/clang/scan-build-${CLANG_VERSION_MAJOR}/libexec/ccc-analyzer ++ -DCMAKE_ASM_COMPILER=/usr/share/clang/scan-build-${CLANG_VERSION_MAJOR}/libexec/ccc-analyzer -DCMAKE_ASM_COMPILER_ID=Clang) # cmake requires CMAKE_LINKER to be specified if the compiler is MSVC-like, diff --git a/debian/rules b/debian/rules index 6e870679..28627833 100755 --- a/debian/rules +++ b/debian/rules @@ -461,7 +461,7 @@ override_dh_auto_configure: preconfigure sed -e "s|@DEB_PATCHSETVERSION@|$(DEBIAN_REVISION)|" \ debian/debian_path.h > clang/include/clang/Debian/debian_path.h if test "$(SCAN_BUILD)" = "yes"; then \ - patch -f -p1 < debian/patches/on-the-fly/use-scan-build-runtimes.diff; \ + patch -f -p1 < debian/patches/on-the-fly/use-scan-build-runtimes.diff||true; \ fi # Configure coverity (we need the compilers) + work around perf issues