From c3c0eb59b90f0c8ddf37f3280295c92742789f84c67e22be87017c9bc66d75a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Thu, 20 Jun 2013 09:28:27 +0000
Subject: [PATCH] - Remove llvm-config-lib64.patch, we can use sed in the spec
 file   instead.

OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/llvm?expand=0&rev=241
---
 llvm-config-lib64.patch | 31 -------------------------------
 llvm.changes            |  6 ++++++
 llvm.spec               |  5 +----
 3 files changed, 7 insertions(+), 35 deletions(-)
 delete mode 100644 llvm-config-lib64.patch

diff --git a/llvm-config-lib64.patch b/llvm-config-lib64.patch
deleted file mode 100644
index 98b5bd8..0000000
--- a/llvm-config-lib64.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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;
-   }
- 
diff --git a/llvm.changes b/llvm.changes
index 9d47626..baee9a2 100644
--- a/llvm.changes
+++ b/llvm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jun 20 09:27:36 UTC 2013 - idonmez@suse.com
+
+- Remove llvm-config-lib64.patch, we can use sed in the spec file
+  instead.
+
 -------------------------------------------------------------------
 Wed Jun 19 12:58:24 UTC 2013 - llunak@suse.com
 
diff --git a/llvm.spec b/llvm.spec
index f18230d..baa39dc 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -38,7 +38,6 @@ 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
@@ -132,9 +131,6 @@ 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
@@ -158,6 +154,7 @@ sed -i s,LLVM_REVISION,\"%{_revision}\",g tools/clang/lib/Basic/Version.cpp
 %if "%{_lib}" == "lib64"
 # Nasty hardcoded path
 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