Hello community,

here is the log from the commit of package llvm for openSUSE:12.1:Update:Test 
checked in at 2011-12-12 21:43:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.1:Update:Test/llvm (Old)
 and      /work/SRC/openSUSE:12.1:Update:Test/.llvm.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "llvm", Maintainer is "mh...@novell.com"

Changes:
--------
--- /work/SRC/openSUSE:12.1:Update:Test/llvm/llvm.changes       2011-12-12 
21:43:05.000000000 +0100
+++ /work/SRC/openSUSE:12.1:Update:Test/.llvm.new/llvm.changes  2011-12-12 
21:43:08.000000000 +0100
@@ -1,0 +2,60 @@
+Mon Dec  5 13:19:22 UTC 2011 - idoen...@suse.de
+
+- Switch to 3-stage bootstrap 
+
+-------------------------------------------------------------------
+Fri Dec  2 12:22:07 UTC 2011 - idoen...@suse.de
+
+- Build first stage compiler with -O0 to workaround gcc 4.5 bug 
+
+-------------------------------------------------------------------
+Thu Dec  1 18:04:15 UTC 2011 - idoen...@suse.de
+
+- Update to final 3.0 release
+  * No real change since rc2
+
+-------------------------------------------------------------------
+Tue Nov 29 13:23:32 UTC 2011 - idoen...@suse.de
+
+- Use %{_lib} macro instead of checking for x86_64
+
+-------------------------------------------------------------------
+Wed Nov 16 14:28:17 UTC 2011 - idon...@suse.com
+
+- Enable ARM support again
+- Switch to optimized build
+
+-------------------------------------------------------------------
+Thu Nov 10 14:54:50 UTC 2011 - idon...@suse.com
+
+- Disable ARM support, VM goes out of memory while compiling it 
+
+-------------------------------------------------------------------
+Thu Nov 10 10:33:01 UTC 2011 - idon...@suse.com
+
+- Really enable ARM support
+- Remove forcing -frtti
+
+-------------------------------------------------------------------
+Mon Nov  7 15:05:52 UTC 2011 - idon...@suse.com
+
+- Update to r143961 from llvm-3.0 branch
+  * No longer hardcoding include paths
+
+-------------------------------------------------------------------
+Mon Nov  7 09:17:40 UTC 2011 - idon...@suse.com
+
+- Fix LLVMgold.so path for x86-64 
+
+-------------------------------------------------------------------
+Sun Nov  6 22:03:12 UTC 2011 - idon...@suse.com
+
+- Enable ld gold support 
+
+-------------------------------------------------------------------
+Tue Nov  1 11:31:57 UTC 2011 - idon...@suse.com
+
+- Update r143456 from llvm-3.0 branch
+  * llvm/clang 3.0rc2
+
+-------------------------------------------------------------------

Old:
----
  llvm-2.9.99.svn20111025.tar.bz2
  llvm-pr9614-part1.patch
  llvm-pr9614-part2.patch

New:
----
  llvm-3.0.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ llvm.spec ++++++
--- /var/tmp/diff_new_pack.0ombfC/_old  2011-12-12 21:43:11.000000000 +0100
+++ /var/tmp/diff_new_pack.0ombfC/_new  2011-12-12 21:43:11.000000000 +0100
@@ -16,17 +16,12 @@
 #
 
 
-%define _revision        142912
+%define _revision     145598
 %define _release_version 3.0
-
-%if 0%{?suse_version} >= 1200
-%define     _gcc_ver 4.6
-%else
-%define     _gcc_ver 4.5
-%endif
+%define _supported_archs "ARM;X86"
 
 Name:           llvm
-Version:        2.9.99.svn20111025
+Version:        3.0
 Release:        1
 License:        NCSA
 Summary:        Low Level Virtual Machine
@@ -40,12 +35,12 @@
 Patch2:         clang-cmake-lib.patch
 # PATCH-FIX-OPENSUSE assume-opensuse.patch idoen...@suse.de -- Always enable 
openSUSE/SUSE features
 Patch3:         assume-opensuse.patch
-# PATCH-FIX-UPSTREAM llvm-pr9614-part1.patch idoen...@suse.de -- Fix LLVM 
PR9614
-Patch4:         llvm-pr9614-part1.patch
-Patch5:         llvm-pr9614-part2.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
@@ -135,62 +130,77 @@
 %patch2
 %patch3
 
-pushd tools/clang
-%patch4 -p2
-%patch5 -p2
-popd
-
 sed -i s,SVN_REVISION,\"%{_revision}\",g tools/clang/lib/Basic/Version.cpp
 
+# Nasty hardcoded path
+%if "%{_lib}" == "lib64"
+sed -i s,/lib/LLVMgold.so,/lib64/LLVMgold.so, tools/clang/lib/Driver/Tools.cpp
+%endif
+
 %build
 TOPLEVEL=$PWD
-mkdir stage1 stage2
-cd stage1
+mkdir stage1 stage2 stage3
+pushd stage1
 
-cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-      -DLLVM_ENABLE_ASSERTIONS=TRUE \
-      -DLLVM_TARGETS_TO_BUILD="ARM;X86" \
-      ..
+# Idiot cmake doesn't let me select my own optimization level here
+# hence we use configure, this needed to workaround a gcc 4.5 bug
+../configure \
+    --enable-optimized \
+    --disable-assertions \
+    --with-optimize-option="-O0" \
+    --enable-targets=host
+
+make %{?_smp_mflags}
+
+popd
+pushd stage2
 
+export CC=$TOPLEVEL/stage1/Release/bin/clang
+export CXX=$TOPLEVEL/stage1/Release/bin/clang++
+
+cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
+      -DCMAKE_BUILD_TYPE=Release \
+      -DLLVM_TARGETS_TO_BUILD=%{_supported_archs} \
+      ..
 make %{?_smp_mflags}
 
-cd ../stage2
+popd
+pushd stage3
 # Needed to make clang resource dir working inside build tree
 ln -s lib lib64
 
-export CC=$TOPLEVEL/stage1/bin/clang
-export CXX=$TOPLEVEL/stage1/bin/clang++
-export CXXFLAGS="%{optflags} -frtti"
+export CC=$TOPLEVEL/stage2/bin/clang
+export CXX=$TOPLEVEL/stage2/bin/clang++
 
 cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} \
-      -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+      -DCMAKE_BUILD_TYPE=Release \
       -DLLVM_ENABLE_ASSERTIONS=FALSE \
       -DLLVM_ENABLE_PIC=TRUE \
       -DLLVM_ENABLE_TIMESTAMPS=FALSE \
-      -DLLVM_TARGETS_TO_BUILD=X86 \
+      -DLLVM_TARGETS_TO_BUILD=%{_supported_archs} \
       -DCLANG_VENDOR="SUSE Linux" \
-%ifarch x86_64
+%if "%{_lib}" == "lib64"
       -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}
 
 %check
-cd stage2
+cd stage3
 make check
 make clang-test
 
 %install
-cd stage2
+cd stage3
 %makeinstall
 cd ..
 
-# Fixup libdir for x86-64
-%ifarch x86_64
+# Fixup libdir
+%if "%{_lib}" == "lib64"
 sed -i s,ABS_RUN_DIR/lib,ABS_RUN_DIR/lib64, %{buildroot}/%{_bindir}/llvm-config
 %endif
 
@@ -324,6 +334,9 @@
 %{_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

++++++ llvm-2.9.99.svn20111025.tar.bz2 -> llvm-3.0.tar.bz2 ++++++
/work/SRC/openSUSE:12.1:Update:Test/llvm/llvm-2.9.99.svn20111025.tar.bz2 
/work/SRC/openSUSE:12.1:Update:Test/.llvm.new/llvm-3.0.tar.bz2 differ: char 11, 
line 1

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to