Hello community,
here is the log from the commit of package llvm for openSUSE:Factory checked in
at 2014-04-09 13:01:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/llvm (Old)
and /work/SRC/openSUSE:Factory/.llvm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "llvm"
Changes:
--------
--- /work/SRC/openSUSE:Factory/llvm/llvm.changes 2014-02-26
23:20:35.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.llvm.new/llvm.changes 2014-04-09
13:01:05.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Apr 3 11:58:28 UTC 2014 - idon...@suse.com
+
+- Fix resource dir for libclang case (clang-resourcedirs.patch)
+- Always build tests
+
+-------------------------------------------------------------------
New:
----
clang-resourcedirs.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ llvm.spec ++++++
--- /var/tmp/diff_new_pack.XRAivD/_old 2014-04-09 13:01:07.000000000 +0200
+++ /var/tmp/diff_new_pack.XRAivD/_new 2014-04-09 13:01:07.000000000 +0200
@@ -45,6 +45,7 @@
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 @@
%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/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 @@
TOPLEVEL=$PWD
mkdir stage1 stage2
pushd stage1
+ln -sf lib lib64
# Define host-triple
%ifarch %{ix86}
@@ -272,7 +277,6 @@
%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 @@
%else
-DLLVM_TARGETS_TO_BUILD=host \
%endif
+ -DLLVM_BUILD_TESTS=ON \
..
make %{?_smp_mflags} VERBOSE=1
++++++ clang-resourcedirs.patch ++++++
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();
}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
