pool/llvm
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 180695 from home:tobijk:X11:XOrg

Browse Source 
Bring back llvm-config lib64 patch to build mesa with shared libs again

OBS-URL: https://build.opensuse.org/request/show/180695
OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/llvm?expand=0&rev=245
This commit is contained in:
Ismail Dönmez 2013-06-26 10:07:09 +00:00 committed by Git OBS Bridge
parent 19427ca1d1
commit 006b44f705
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
llvm-config-lib64.patch Normal file
View File

@ -0,0 +1,31 @@
diff -ur llvm.orig/tools/llvm-config/llvm-config.cpp llvm/tools/llvm-config/llvm-config.cpp
--- llvm.orig/tools/llvm-config/llvm-config.cpp 2012-11-12 11:25:40.547628293 +0100
+++ llvm/tools/llvm-config/llvm-config.cpp 2012-12-02 15:09:31.981279773 +0100
@@ -231,15 +231,15 @@
switch (DevelopmentTreeLayout) {
case MakefileStyle:
ActiveBinDir = ActiveObjRoot + "/" + LLVM_BUILDMODE + "/bin";
- ActiveLibDir = ActiveObjRoot + "/" + LLVM_BUILDMODE + "/lib";
+ ActiveLibDir = ActiveObjRoot + "/" + LLVM_BUILDMODE + "/lib64";
break;
case CMakeStyle:
ActiveBinDir = ActiveObjRoot + "/bin";
- ActiveLibDir = ActiveObjRoot + "/lib";
+ ActiveLibDir = ActiveObjRoot + "/lib64";
break;
case CMakeBuildModeStyle:
ActiveBinDir = ActiveObjRoot + "/bin/" + LLVM_BUILDMODE;
- ActiveLibDir = ActiveObjRoot + "/lib/" + LLVM_BUILDMODE;
+ ActiveLibDir = ActiveObjRoot + "/lib64/" + LLVM_BUILDMODE;
break;
}
@@ -250,7 +250,7 @@
ActivePrefix = CurrentExecPrefix;
ActiveIncludeDir = ActivePrefix + "/include";
ActiveBinDir = ActivePrefix + "/bin";
- ActiveLibDir = ActivePrefix + "/lib";
+ ActiveLibDir = ActivePrefix + "/lib64";
ActiveIncludeOption = "-I" + ActiveIncludeDir;
}

6
llvm.spec
View File

@ -38,6 +38,7 @@ Patch2: assume-opensuse.patch
Patch3: clang-disable-ada-extension.patch Patch3: clang-disable-ada-extension.patch
# PATCH-FIX-OPENSUSE default-to-i586.patch -- Use i586 as default target for 32bit # PATCH-FIX-OPENSUSE default-to-i586.patch -- Use i586 as default target for 32bit
Patch4: default-to-i586.patch Patch4: default-to-i586.patch
Patch5: llvm-config-lib64.patch
# PATCH-FIX-OPENSUSE arm_suse_support.diff --Enable ARM suse toolchain support # PATCH-FIX-OPENSUSE arm_suse_support.diff --Enable ARM suse toolchain support
Patch6: arm_suse_support.diff Patch6: arm_suse_support.diff
# PATCH-FIX-OPENSUSE disable_neon_in_armv7.diff -- Disable use of neon in armv7 openSUSE # PATCH-FIX-OPENSUSE disable_neon_in_armv7.diff -- Disable use of neon in armv7 openSUSE
@ -131,6 +132,9 @@ This package contains vim plugins for LLVM like syntax highlighting.
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
%if "%{_lib}" == "lib64"
%patch5 -p1
%endif
%ifarch %arm %ifarch %arm
%patch6 -p1 %patch6 -p1
%patch9 -p1 %patch9 -p1
@ -153,8 +157,8 @@ sed -i s,LLVM_REVISION,\"%{_revision}\",g tools/clang/lib/Basic/Version.cpp
%if "%{_lib}" == "lib64" %if "%{_lib}" == "lib64"
# Nasty hardcoded path # Nasty hardcoded path
# tools/llvm-config/llvm-config.cpp \
sed -i s,/lib/,/%{_lib}/,g tools/clang/lib/Driver/Tools.cpp \ sed -i s,/lib/,/%{_lib}/,g tools/clang/lib/Driver/Tools.cpp \
tools/llvm-config/llvm-config.cpp \
tools/clang/test/Preprocessor/iwithprefix.c tools/clang/test/Preprocessor/iwithprefix.c
%endif %endif