Accepting request 90302 from devel:tools:compiler

- Update to r143961 from llvm-3.0 branch
  * No longer hardcoding include paths

- Fix LLVMgold.so path for x86-64 

- Enable ld gold support

OBS-URL: https://build.opensuse.org/request/show/90302
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/llvm?expand=0&rev=19

llvm-2.9.99.svn20111101.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:abff0ad36592b3b85b6dfb53ab48743a86183ce16c995928ae8a183e8c1fcbb3
-size 13965478

llvm-2.9.99.svn20111106.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4e405888b4a4dfdfff799a6d0ab2f933d83dcc7f62406d55ba337d98a7196304
+size 13958733

llvm.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Mon Nov  7 15:05:52 UTC 2011 - idonmez@suse.com
+
+- Update to r143961 from llvm-3.0 branch
+  * No longer hardcoding include paths
+
+-------------------------------------------------------------------
+Mon Nov  7 09:17:40 UTC 2011 - idonmez@suse.com
+
+- Fix LLVMgold.so path for x86-64 
+
+-------------------------------------------------------------------
+Sun Nov  6 22:03:12 UTC 2011 - idonmez@suse.com
+
+- Enable ld gold support 
+
 -------------------------------------------------------------------
 Tue Nov  1 11:31:57 UTC 2011 - idonmez@suse.com
 

llvm.spec

@@ -16,17 +16,11 @@
 #
 
 
-%define _revision        142912
+%define _revision     143961
 %define _release_version 3.0
 
-%if 0%{?suse_version} >= 1200
-%define     _gcc_ver 4.6
-%else
-%define     _gcc_ver 4.5
-%endif
-
 Name:           llvm
-Version:        2.9.99.svn20111101
+Version:        2.9.99.svn20111106
 Release:        1
 License:        NCSA
 Summary:        Low Level Virtual Machine
@@ -43,6 +37,9 @@ Patch3:         assume-opensuse.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  autoconf
 BuildRequires:  automake
+%if 0%{?suse_version} >= 1220
+BuildRequires:  binutils-devel >= 2.21.90
+%endif
 BuildRequires:  bison
 BuildRequires:  chrpath
 BuildRequires:  cmake
@@ -134,6 +131,11 @@ This package contains vim plugins for LLVM like syntax highlighting.
 
 sed -i s,SVN_REVISION,\"%{_revision}\",g tools/clang/lib/Basic/Version.cpp
 
+# Nasty hardcoded path
+%ifarch x86_64 
+sed -i s,/lib/LLVMgold.so,/lib64/LLVMgold.so, tools/clang/lib/Driver/Tools.cpp
+%endif
+
 %build
 TOPLEVEL=$PWD
 mkdir stage1 stage2
@@ -163,11 +165,11 @@ cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
       -DCLANG_VENDOR="SUSE Linux" \
 %ifarch x86_64
       -DLLVM_LIBDIR_SUFFIX=64 \
+%endif
+%if 0%{?suse_version} >= 1220
+      -DLLVM_BINUTILS_INCDIR=/usr/include \
 %endif
       -DCLANG_RESOURCE_DIR="../%{_lib}/clang/%{_release_version}" \
-      -DC_INCLUDE_DIRS="/usr/include:\
-%{_libdir}/gcc/%{_target_cpu}-suse-linux/%{_gcc_ver}/include:\
-%{_libdir}/gcc/%{_target_cpu}-suse-linux/%{_gcc_ver}/include-fixed" \
       ..
 make %{?_smp_mflags}
 
@@ -316,6 +318,9 @@ rm -f %{buildroot}%{_libdir}/libEnhancedDisassembly.*
 %{_mandir}/man1/clang.1.gz
 %{_libdir}/libclang.so.*
 %{_libdir}/libLTO.so
+%if 0%{?suse_version} >= 1220
+%{_libdir}/LLVMgold.so
+%endif
 %dir %{_libdir}/clang
 %dir %{_libdir}/clang/*
 %dir %{_libdir}/clang/*/include