mirror of
https://git.proxmox.com/git/llvm-toolchain
synced 2025-07-27 09:50:53 +00:00
rebase of the patch
This commit is contained in:
parent
3f272f2137
commit
342b3e8e5a
10
debian/patches/clang-analyzer-force-version.diff
vendored
10
debian/patches/clang-analyzer-force-version.diff
vendored
@ -1,11 +1,11 @@
|
||||
# Force the version of clang in the analyzer
|
||||
# This was causing the static analyzer to fail silently if the clang & clang++ are
|
||||
# not installed
|
||||
Index: llvm-toolchain-snapshot_3.7~svn242297/clang/tools/scan-build/ccc-analyzer
|
||||
Index: llvm-toolchain-snapshot_3.8~svn253186/clang/tools/scan-build/libexec/ccc-analyzer
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_3.7~svn242297.orig/clang/tools/scan-build/ccc-analyzer
|
||||
+++ llvm-toolchain-snapshot_3.7~svn242297/clang/tools/scan-build/ccc-analyzer
|
||||
@@ -90,7 +90,7 @@ if ($FindBin::Script =~ /c\+\+-analyzer/
|
||||
--- llvm-toolchain-snapshot_3.8~svn253186.orig/clang/tools/scan-build/libexec/ccc-analyzer
|
||||
+++ llvm-toolchain-snapshot_3.8~svn253186/clang/tools/scan-build/libexec/ccc-analyzer
|
||||
@@ -91,7 +91,7 @@ if ($FindBin::Script =~ /c\+\+-analyzer/
|
||||
if (!defined $Compiler || (! -x $Compiler && ! SearchInPath($Compiler))) { $Compiler = $DefaultCXXCompiler; }
|
||||
|
||||
$Clang = $ENV{'CLANG_CXX'};
|
||||
@ -14,7 +14,7 @@ Index: llvm-toolchain-snapshot_3.7~svn242297/clang/tools/scan-build/ccc-analyzer
|
||||
|
||||
$IsCXX = 1
|
||||
}
|
||||
@@ -99,7 +99,7 @@ else {
|
||||
@@ -100,7 +100,7 @@ else {
|
||||
if (!defined $Compiler || (! -x $Compiler && ! SearchInPath($Compiler))) { $Compiler = $DefaultCCompiler; }
|
||||
|
||||
$Clang = $ENV{'CLANG'};
|
||||
|
9
debian/patches/disable-execinfo-usage.diff
vendored
9
debian/patches/disable-execinfo-usage.diff
vendored
@ -1,8 +1,8 @@
|
||||
Index: llvm-toolchain-snapshot_3.7~svn241915/lldb/lib/Makefile
|
||||
Index: llvm-toolchain-snapshot_3.8~svn253186/lldb/lib/Makefile
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_3.7~svn241915.orig/lldb/lib/Makefile
|
||||
+++ llvm-toolchain-snapshot_3.7~svn241915/lldb/lib/Makefile
|
||||
@@ -200,6 +200,6 @@ ifeq ($(HOST_OS),FreeBSD)
|
||||
--- llvm-toolchain-snapshot_3.8~svn253186.orig/lldb/lib/Makefile
|
||||
+++ llvm-toolchain-snapshot_3.8~svn253186/lldb/lib/Makefile
|
||||
@@ -201,7 +201,7 @@ ifeq ($(HOST_OS),FreeBSD)
|
||||
# Allow unresolved symbols.
|
||||
LLVMLibsOptions += -Wl,--allow-shlib-undefined
|
||||
# Link in python
|
||||
@ -10,3 +10,4 @@ Index: llvm-toolchain-snapshot_3.7~svn241915/lldb/lib/Makefile
|
||||
+ LLVMLibsOptions += $(PYTHON_BUILD_FLAGS) -lrt \
|
||||
-ledit -lncurses -lpanel -lpthread
|
||||
endif
|
||||
|
||||
|
10
debian/patches/lldb-soname.diff
vendored
10
debian/patches/lldb-soname.diff
vendored
@ -1,7 +1,7 @@
|
||||
Index: llvm-toolchain-snapshot_3.7~svn241915/lldb/lib/Makefile
|
||||
Index: llvm-toolchain-snapshot_3.8~svn253186/lldb/lib/Makefile
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_3.7~svn241915.orig/lldb/lib/Makefile
|
||||
+++ llvm-toolchain-snapshot_3.7~svn241915/lldb/lib/Makefile
|
||||
--- llvm-toolchain-snapshot_3.8~svn253186.orig/lldb/lib/Makefile
|
||||
+++ llvm-toolchain-snapshot_3.8~svn253186/lldb/lib/Makefile
|
||||
@@ -16,6 +16,7 @@ LIBRARYNAME = lldb
|
||||
NO_BUILD_ARCHIVE = 1
|
||||
LINK_LIBS_IN_SHARED = 1
|
||||
@ -9,8 +9,8 @@ Index: llvm-toolchain-snapshot_3.7~svn241915/lldb/lib/Makefile
|
||||
+SONAME_EXTENSION = 1
|
||||
|
||||
ifeq (,$(findstring -DLLDB_DISABLE_PYTHON,$(CXXFLAGS)))
|
||||
PYTHON_BUILD_FLAGS = $(shell python-config --ldflags)
|
||||
@@ -190,7 +191,7 @@ ifeq ($(HOST_OS), $(filter $(HOST_OS), L
|
||||
PYTHON_CONFIG?= python-config
|
||||
@@ -191,7 +192,7 @@ ifeq ($(HOST_OS), $(filter $(HOST_OS), L
|
||||
LLVMLibsOptions += -Wl,--no-undefined
|
||||
# Link in python
|
||||
LLVMLibsOptions += $(PYTHON_BUILD_FLAGS) -lrt -ledit -lncurses -lpanel -lpthread
|
||||
|
18
debian/patches/scan-build-clang-path.diff
vendored
18
debian/patches/scan-build-clang-path.diff
vendored
@ -1,13 +1,13 @@
|
||||
Index: llvm-toolchain-snapshot_3.8~svn249699/clang/tools/scan-build/scan-build
|
||||
Index: llvm-toolchain-snapshot_3.8~svn253186/clang/tools/scan-build/bin/scan-build
|
||||
===================================================================
|
||||
--- llvm-toolchain-snapshot_3.8~svn249699.orig/clang/tools/scan-build/scan-build
|
||||
+++ llvm-toolchain-snapshot_3.8~svn249699/clang/tools/scan-build/scan-build
|
||||
@@ -1405,7 +1405,7 @@ sub ShellEscape {
|
||||
|
||||
sub FindClang {
|
||||
--- llvm-toolchain-snapshot_3.8~svn253186.orig/clang/tools/scan-build/bin/scan-build
|
||||
+++ llvm-toolchain-snapshot_3.8~svn253186/clang/tools/scan-build/bin/scan-build
|
||||
@@ -1407,7 +1407,7 @@ sub FindClang {
|
||||
if (!defined $Options{AnalyzerDiscoveryMethod}) {
|
||||
- $Clang = Cwd::realpath("$RealBin/bin/clang") if (-f "$RealBin/bin/clang");
|
||||
+ $Clang = Cwd::realpath("/usr/lib/llvm-3.8/bin/clang");
|
||||
$Clang = Cwd::realpath("$RealBin/bin/clang") if (-f "$RealBin/bin/clang");
|
||||
if (!defined $Clang || ! -x $Clang) {
|
||||
$Clang = Cwd::realpath("$RealBin/clang") if (-f "$RealBin/clang");
|
||||
- $Clang = Cwd::realpath("$RealBin/clang") if (-f "$RealBin/clang");
|
||||
+ $Clang = Cwd::realpath("/usr/lib/llvm-3.8/bin/clang");
|
||||
}
|
||||
if (!defined $Clang || ! -x $Clang) {
|
||||
return "error: Cannot find an executable 'clang' relative to" .
|
||||
|
Loading…
Reference in New Issue
Block a user