From 006b44f70558aa2f5704a454cd5fb527f1c769aa4ce64dec6c71a36979d8c1b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Wed, 26 Jun 2013 10:07:09 +0000
Subject: [PATCH] Accepting request 180695 from home:tobijk:X11:XOrg

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
---
 llvm-config-lib64.patch | 31 +++++++++++++++++++++++++++++++
 llvm.spec               |  6 +++++-
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 llvm-config-lib64.patch

diff --git a/llvm-config-lib64.patch b/llvm-config-lib64.patch
new file mode 100644
index 0000000..3cd7ac4
--- /dev/null
+++ b/llvm-config-lib64.patch
@@ -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;
+   }
+   
\ No newline at end of file
diff --git a/llvm.spec b/llvm.spec
index 7d071f2..2780b87 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -38,6 +38,7 @@ Patch2:         assume-opensuse.patch
 Patch3:         clang-disable-ada-extension.patch
 # PATCH-FIX-OPENSUSE default-to-i586.patch -- Use i586 as default target for 32bit
 Patch4:         default-to-i586.patch
+Patch5:         llvm-config-lib64.patch
 # PATCH-FIX-OPENSUSE arm_suse_support.diff --Enable ARM suse toolchain support
 Patch6:         arm_suse_support.diff
 # 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
 %patch3 -p1
 %patch4 -p1
+%if "%{_lib}" == "lib64"
+%patch5 -p1
+%endif
 %ifarch %arm
 %patch6 -p1
 %patch9 -p1
@@ -153,8 +157,8 @@ sed -i s,LLVM_REVISION,\"%{_revision}\",g tools/clang/lib/Basic/Version.cpp
 
 %if "%{_lib}" == "lib64"
 # Nasty hardcoded path
+#                           tools/llvm-config/llvm-config.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
 %endif