proxmox-mirrors/llvm-toolchain
1
0
Fork 0
mirror of https://git.proxmox.com/git/llvm-toolchain synced 2025-07-27 11:41:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

rebase of the patch

Browse Source
This commit is contained in:
Sylvestre Ledru 2015-11-16 08:41:19 +00:00
parent 3f272f2137
commit 342b3e8e5a
4 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
debian/patches/clang-analyzer-force-version.diff vendored
View File

@ -1,11 +1,11 @@
# Force the version of clang in the analyzer # Force the version of clang in the analyzer
# This was causing the static analyzer to fail silently if the clang & clang++ are # This was causing the static analyzer to fail silently if the clang & clang++ are
# not installed # 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.8~svn253186.orig/clang/tools/scan-build/libexec/ccc-analyzer
+++ llvm-toolchain-snapshot_3.7~svn242297/clang/tools/scan-build/ccc-analyzer +++ llvm-toolchain-snapshot_3.8~svn253186/clang/tools/scan-build/libexec/ccc-analyzer
@@ -90,7 +90,7 @@ if ($FindBin::Script =~ /c\+\+-analyzer/ @@ -91,7 +91,7 @@ if ($FindBin::Script =~ /c\+\+-analyzer/
if (!defined $Compiler || (! -x $Compiler && ! SearchInPath($Compiler))) { $Compiler = $DefaultCXXCompiler; } if (!defined $Compiler || (! -x $Compiler && ! SearchInPath($Compiler))) { $Compiler = $DefaultCXXCompiler; }
$Clang = $ENV{'CLANG_CXX'}; $Clang = $ENV{'CLANG_CXX'};
@ -14,7 +14,7 @@ Index: llvm-toolchain-snapshot_3.7~svn242297/clang/tools/scan-build/ccc-analyzer
$IsCXX = 1 $IsCXX = 1
} }
@@ -99,7 +99,7 @@ else { @@ -100,7 +100,7 @@ else {
if (!defined $Compiler || (! -x $Compiler && ! SearchInPath($Compiler))) { $Compiler = $DefaultCCompiler; } if (!defined $Compiler || (! -x $Compiler && ! SearchInPath($Compiler))) { $Compiler = $DefaultCCompiler; }
$Clang = $ENV{'CLANG'}; $Clang = $ENV{'CLANG'};

9
debian/patches/disable-execinfo-usage.diff vendored
View File

@ -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.8~svn253186.orig/lldb/lib/Makefile
+++ llvm-toolchain-snapshot_3.7~svn241915/lldb/lib/Makefile +++ llvm-toolchain-snapshot_3.8~svn253186/lldb/lib/Makefile
@@ -200,6 +200,6 @@ ifeq ($(HOST_OS),FreeBSD) @@ -201,7 +201,7 @@ ifeq ($(HOST_OS),FreeBSD)
# Allow unresolved symbols. # Allow unresolved symbols.
LLVMLibsOptions += -Wl,--allow-shlib-undefined LLVMLibsOptions += -Wl,--allow-shlib-undefined
# Link in python # Link in python
@ -10,3 +10,4 @@ Index: llvm-toolchain-snapshot_3.7~svn241915/lldb/lib/Makefile
+ LLVMLibsOptions += $(PYTHON_BUILD_FLAGS) -lrt \ + LLVMLibsOptions += $(PYTHON_BUILD_FLAGS) -lrt \
-ledit -lncurses -lpanel -lpthread -ledit -lncurses -lpanel -lpthread
endif endif

10
debian/patches/lldb-soname.diff vendored
View File

@ -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.8~svn253186.orig/lldb/lib/Makefile
+++ llvm-toolchain-snapshot_3.7~svn241915/lldb/lib/Makefile +++ llvm-toolchain-snapshot_3.8~svn253186/lldb/lib/Makefile
@@ -16,6 +16,7 @@ LIBRARYNAME = lldb @@ -16,6 +16,7 @@ LIBRARYNAME = lldb
NO_BUILD_ARCHIVE = 1 NO_BUILD_ARCHIVE = 1
LINK_LIBS_IN_SHARED = 1 LINK_LIBS_IN_SHARED = 1
@ -9,8 +9,8 @@ Index: llvm-toolchain-snapshot_3.7~svn241915/lldb/lib/Makefile
+SONAME_EXTENSION = 1 +SONAME_EXTENSION = 1
ifeq (,$(findstring -DLLDB_DISABLE_PYTHON,$(CXXFLAGS))) ifeq (,$(findstring -DLLDB_DISABLE_PYTHON,$(CXXFLAGS)))
PYTHON_BUILD_FLAGS = $(shell python-config --ldflags) PYTHON_CONFIG?= python-config
@@ -190,7 +191,7 @@ ifeq ($(HOST_OS), $(filter $(HOST_OS), L @@ -191,7 +192,7 @@ ifeq ($(HOST_OS), $(filter $(HOST_OS), L
LLVMLibsOptions += -Wl,--no-undefined LLVMLibsOptions += -Wl,--no-undefined
# Link in python # Link in python
LLVMLibsOptions += $(PYTHON_BUILD_FLAGS) -lrt -ledit -lncurses -lpanel -lpthread LLVMLibsOptions += $(PYTHON_BUILD_FLAGS) -lrt -ledit -lncurses -lpanel -lpthread

18
debian/patches/scan-build-clang-path.diff vendored
View File

@ -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~svn253186.orig/clang/tools/scan-build/bin/scan-build
+++ llvm-toolchain-snapshot_3.8~svn249699/clang/tools/scan-build/scan-build +++ llvm-toolchain-snapshot_3.8~svn253186/clang/tools/scan-build/bin/scan-build
@@ -1405,7 +1405,7 @@ sub ShellEscape { @@ -1407,7 +1407,7 @@ sub FindClang {
sub FindClang {
if (!defined $Options{AnalyzerDiscoveryMethod}) { if (!defined $Options{AnalyzerDiscoveryMethod}) {
- $Clang = Cwd::realpath("$RealBin/bin/clang") if (-f "$RealBin/bin/clang"); $Clang = Cwd::realpath("$RealBin/bin/clang") if (-f "$RealBin/bin/clang");
+ $Clang = Cwd::realpath("/usr/lib/llvm-3.8/bin/clang");
if (!defined $Clang || ! -x $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" .