From ffa9611f01af4e8a2e32963962b3886317f07563fa283a80daad0100b21de6cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Thu, 3 Apr 2014 11:59:56 +0000
Subject: [PATCH] - Fix resource dir for libclang case
 (clang-resourcedirs.patch) - Always build tests

OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/llvm?expand=0&rev=348
---
 clang-resourcedirs.patch | 18 ++++++++++++++++++
 llvm.changes             |  6 ++++++
 llvm.spec                |  7 ++++++-
 3 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 clang-resourcedirs.patch

diff --git a/clang-resourcedirs.patch b/clang-resourcedirs.patch
new file mode 100644
index 0000000..1410280
--- /dev/null
+++ b/clang-resourcedirs.patch
@@ -0,0 +1,18 @@
+Index: llvm/tools/clang/lib/Driver/Driver.cpp
+===================================================================
+--- llvm.orig/tools/clang/lib/Driver/Driver.cpp
++++ llvm/tools/clang/lib/Driver/Driver.cpp
+@@ -66,11 +66,11 @@ Driver::Driver(StringRef ClangExecutable
+ 
+   // Compute the path to the resource directory.
+   StringRef ClangResourceDir(CLANG_RESOURCE_DIR);
+-  SmallString<128> P(Dir);
++  SmallString<128> P((Dir != "") ? Dir : "/usr/bin/");
+   if (ClangResourceDir != "")
+     llvm::sys::path::append(P, ClangResourceDir);
+   else
+-    llvm::sys::path::append(P, "..", "lib", "clang", CLANG_VERSION_STRING);
++    llvm::sys::path::append(P, "..", "LLVM_LIBDIR", "clang", CLANG_VERSION_STRING);
+   ResourceDir = P.str();
+ }
+ 
diff --git a/llvm.changes b/llvm.changes
index 3de7370..247f420 100644
--- a/llvm.changes
+++ b/llvm.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Apr  3 11:58:28 UTC 2014 - idonmez@suse.com
+
+- Fix resource dir for libclang case (clang-resourcedirs.patch)
+- Always build tests
+
 -------------------------------------------------------------------
 Sat Feb 22 18:18:57 CET 2014 - ro@suse.de
 
diff --git a/llvm.spec b/llvm.spec
index 6dde90c..1cdba69 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -45,6 +45,7 @@ Patch8:         aarch64-suse-support.patch
 Patch9:         arm-remove-xfails.diff
 # PATCH-FIX-OPENSUSE asan-disable-hugemalloctest.patch -- Disable ASAN HugeMallocTest
 Patch10:        asan-disable-hugemalloctest.patch
+Patch11:        clang-resourcedirs.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -153,6 +154,7 @@ This package contains the Python bindings to clang (C language) frontend for LLV
 %patch8 -p1
 %patch9
 %patch10 -p1
+%patch11 -p1
 
 # We hardcode i586
 rm tools/clang/test/Driver/x86_features.c
@@ -172,6 +174,8 @@ sed -i s,"/lib/","/lib64/",g tools/clang/lib/Driver/Tools.cpp \
 sed -i s,"}lib{","}lib64{",g tools/clang/test/Preprocessor/iwithprefix.c
 %endif
 
+sed -i s,LLVM_LIBDIR,%{_lib}, tools/clang/lib/Driver/Driver.cpp
+
 # Only enable target archs otherwise llvm-config is messed up
 %ifarch %{ix86} x86_64
 sed -i s,"subdirectories = .*","subdirectories = R600 X86", lib/Target/LLVMBuild.txt
@@ -196,6 +200,7 @@ echo > utils/unittest/LLVMBuild.txt
 TOPLEVEL=$PWD
 mkdir stage1 stage2
 pushd stage1
+ln -sf lib lib64
 
 # Define host-triple
 %ifarch %{ix86}
@@ -272,7 +277,6 @@ cmake -G "Unix Makefiles" \
 %endif
 %if "%{_lib}" == "lib64"
       -DLLVM_LIBDIR_SUFFIX=64 \
-      -DCLANG_RESOURCE_DIR=../%{_lib}/clang/%{_release_version} \
 %endif
       -DLLVM_REQUIRES_RTTI=ON \
       -DLLVM_ENABLE_TIMESTAMPS=OFF \
@@ -286,6 +290,7 @@ cmake -G "Unix Makefiles" \
 %else
       -DLLVM_TARGETS_TO_BUILD=host \
 %endif
+      -DLLVM_BUILD_TESTS=ON \
       ..
 
 make %{?_smp_mflags} VERBOSE=1