SPECS: gcc.spec - apply branch fixes (mostly c++ mem/cpu hogs). - apply ix8...

[pluto]

Author: pluto                        Date: Mon Jun 16 11:16:40 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- apply branch fixes (mostly c++ mem/cpu hogs).
- apply ix86 branch diff for recent intel/amd processors
  with hardware aes/pclmul support.
- disable qt(peer) bcond. build requires ac/am/lt regen but libjava
  runtime (natRuntime.cc) uses deprecated/removed libtool-1.5 api
  (see lt_dlforeach function). finally it doesn;t build at all.
- release 1.

---- Files affected:
SPECS:
   gcc.spec (1.539 -> 1.540) 

---- Diffs:

================================================================
Index: SPECS/gcc.spec
diff -u SPECS/gcc.spec:1.539 SPECS/gcc.spec:1.540
--- SPECS/gcc.spec:1.539	Sat Jun 14 00:09:52 2008
+++ SPECS/gcc.spec	Mon Jun 16 13:16:34 2008
@@ -16,7 +16,7 @@
 %bcond_without	dssi		# don't build libgcj DSSI MIDI interface
 %bcond_without	gtk		# don't build libgcj GTK peer
 %bcond_without	mozilla		# don't build libgcjwebplugin
-%bcond_without	qt		# don't build libgcj Qt peer
+%bcond_with	qt		# build libgcj Qt peer (currently doesn't build with libtool-2.x)
 %bcond_without	x		# don't build libgcj Xlib-dependent AWTs (incl. GTK/Qt)
 %bcond_without	multilib	# build without multilib support (it needs glibc[32&64]-devel)
 %bcond_with	profiling	# build with profiling
@@ -53,7 +53,7 @@
 Summary(pt_BR.UTF-8):	Coleção dos compiladores GNU: o compilador C e arquivos compartilhados
 Name:		gcc
 Version:	%{_major_ver}.%{_minor_ver}
-Release:	0.1
+Release:	1
 Epoch:		6
 License:	GPL v3+
 Group:		Development/Languages
@@ -61,12 +61,13 @@
 # Source0-md5:	4afa0290cc3a41ac8822666f1110de98
 Source1:	%{name}-optimize-la.pl
 Patch100:	%{name}-branch.diff.bz2
+Patch101:	%{name}-ix86-branch.diff.bz2
 Patch0:		%{name}-info.patch
 Patch1:		%{name}-nolocalefiles.patch
 Patch2:		%{name}-nodebug.patch
 Patch3:		%{name}-ada-link.patch
 Patch4:		%{name}-sparc64-ada_fix.patch
-
+Patch5:		%{name}-pr36519.patch
 Patch6:		%{name}-ppc64-m32-m64-multilib-only.patch
 Patch7:		%{name}-libjava-multilib.patch
 Patch8:		%{name}-enable-java-awt-qt.patch
@@ -1301,16 +1302,19 @@
 
 %prep
 %setup -q
-#patch100 -p0
+%patch100 -p0
+%patch101 -p0
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-
+%patch5 -p0
 %patch6 -p1
-%patch7 -p1
+%patch7 -p0
+%if %{with qt}
 %patch8 -p1
+%endif
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
@@ -1322,23 +1326,14 @@
 echo "release" > gcc/DEV-PHASE
 
 %build
-%{__libtoolize}
-install /usr/share/aclocal/{libtool,lt*}.m4 .
 cd gcc
 %{__autoconf}
 cd ..
-cd libjava
-%{__autoconf}
-cd classpath
+%if %{with qt}
+cd libjava/classpath
 %{__autoconf}
 cd ../..
-for dir in libffi libjava libssp libmudflap libgfortran zlib boehm-gc libstdc++-v3 libobjc; do
-cdir=$(pwd)
-	cd $dir
-	[ "$dir" = "libjava" ] && %{__libtoolize} --ltdl
-	autoreconf --force --install --warnings=no-portability 
-	cd $cdir
-done
+%endif
 cp -f /usr/share/automake/config.sub .
 
 rm -rf builddir && install -d builddir && cd builddir
@@ -1395,7 +1390,7 @@
 	--enable-libstdcxx-allocator=new \
 %endif
 %if %{with java}
-	--disable-libjava-multilib \
+	--enable-libjava-multilib=no \
 	%{!?with_alsa:--disable-alsa} \
 	%{!?with_dssi:--disable-dssi} \
 	--disable-gconf-peer \
@@ -1695,6 +1690,7 @@
 %{_libdir}/gcc/*/*/include/pmmintrin.h
 %{_libdir}/gcc/*/*/include/smmintrin.h
 %{_libdir}/gcc/*/*/include/tmmintrin.h
+%{_libdir}/gcc/*/*/include/wmmintrin.h
 %{_libdir}/gcc/*/*/include/xmmintrin.h
 %endif
 %ifarch powerpc ppc ppc64
@@ -2149,7 +2145,16 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.539  2008/06/13 22:09:52  arekm
+Revision 1.540  2008/06/16 11:16:34  pluto
+- apply branch fixes (mostly c++ mem/cpu hogs).
+- apply ix86 branch diff for recent intel/amd processors
+  with hardware aes/pclmul support.
+- disable qt(peer) bcond. build requires ac/am/lt regen but libjava
+  runtime (natRuntime.cc) uses deprecated/removed libtool-1.5 api
+  (see lt_dlforeach function). finally it doesn;t build at all.
+- release 1.
+
+Revision 1.539  2008-06-13 22:09:52  arekm
 - libtool solved
 
 Revision 1.538  2008-06-13 11:04:53  arekm
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/gcc.spec?r1=1.539&r2=1.540&f=u