From b87cb98dec11c233751d750fb1ca68d2d3a04e28 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 3 Sep 2015 09:15:20 +0000 Subject: [PATCH] refresh of the patches --- debian/patches/do-not-fail-on-unexpected-pass.diff | 10 +++++----- debian/patches/scan-build-clang-path.diff | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/debian/patches/do-not-fail-on-unexpected-pass.diff b/debian/patches/do-not-fail-on-unexpected-pass.diff index 87dc3dd5..9c5cb1e0 100644 --- a/debian/patches/do-not-fail-on-unexpected-pass.diff +++ b/debian/patches/do-not-fail-on-unexpected-pass.diff @@ -1,9 +1,9 @@ -Index: llvm-toolchain-3.4-3.4~+rc1/utils/lit/lit/Test.py +Index: llvm-toolchain-snapshot_3.8~svn246750/utils/lit/lit/Test.py =================================================================== ---- llvm-toolchain-3.4-3.4~+rc1.orig/utils/lit/lit/Test.py 2013-09-14 03:19:17.000000000 +0200 -+++ llvm-toolchain-3.4-3.4~+rc1/utils/lit/lit/Test.py 2013-12-01 23:11:25.721571881 +0100 -@@ -27,7 +27,7 @@ - PASS = ResultCode('PASS', False) +--- llvm-toolchain-snapshot_3.8~svn246750.orig/utils/lit/lit/Test.py ++++ llvm-toolchain-snapshot_3.8~svn246750/utils/lit/lit/Test.py +@@ -30,7 +30,7 @@ PASS = ResultCode('PASS', False) + FLAKYPASS = ResultCode('FLAKYPASS', False) XFAIL = ResultCode('XFAIL', False) FAIL = ResultCode('FAIL', True) -XPASS = ResultCode('XPASS', True) diff --git a/debian/patches/scan-build-clang-path.diff b/debian/patches/scan-build-clang-path.diff index b1dad337..486a6302 100644 --- a/debian/patches/scan-build-clang-path.diff +++ b/debian/patches/scan-build-clang-path.diff @@ -1,11 +1,11 @@ -Index: llvm-toolchain-snapshot_3.7~svn241915/clang/tools/scan-build/scan-build +Index: llvm-toolchain-snapshot_3.8~svn246750/clang/tools/scan-build/scan-build =================================================================== ---- llvm-toolchain-snapshot_3.7~svn241915.orig/clang/tools/scan-build/scan-build -+++ llvm-toolchain-snapshot_3.7~svn241915/clang/tools/scan-build/scan-build -@@ -1579,7 +1579,7 @@ if (!@ARGV and !$RequestDisplayHelp) { +--- llvm-toolchain-snapshot_3.8~svn246750.orig/clang/tools/scan-build/scan-build ++++ llvm-toolchain-snapshot_3.8~svn246750/clang/tools/scan-build/scan-build +@@ -1642,7 +1642,7 @@ if (!@ARGV and !$RequestDisplayHelp) { # Find 'clang' - if (!defined $AnalyzerDiscoveryMethod) { + if (!defined $Options{AnalyzerDiscoveryMethod}) { - $Clang = Cwd::realpath("$RealBin/bin/clang"); + $Clang = Cwd::realpath("/usr/lib/llvm-3.8/bin/clang"); if (!defined $Clang || ! -x $Clang) {