ooo-build r14155 - in branches/ooo-build-3-0: . bin

[strba svn gnome org]

Author: strba
Date: Tue Sep 30 14:35:48 2008
New Revision: 14155
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14155&view=rev

Log:
internal gcc 4.2.3 and internal binutils 2.18, to make _rene_ laugh very very very loud

Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/Makefile.am
   branches/ooo-build-3-0/bin/setup.in
   branches/ooo-build-3-0/configure.in
   branches/ooo-build-3-0/download.in

Modified: branches/ooo-build-3-0/Makefile.am
==============================================================================
--- branches/ooo-build-3-0/Makefile.am	(original)
+++ branches/ooo-build-3-0/Makefile.am	Tue Sep 30 14:35:48 2008
@@ -24,9 +24,10 @@
 	for icons in $(OOO_ICONS_VERS) ; do \
 	    test "$(BUILDDIR)/$$icons" = "/" || rm -rf "$(BUILDDIR)/$$icons" ; \
 	done
-	test -z "$(BUILDDIR)/gcc-3.4.1" || rm -rf $(BUILDDIR)/gcc-3.4.1
+	test -z "$(BUILDDIR)/gcc-*" || rm -rf $(BUILDDIR)/gcc-*
+	test -z "$(BUILDDIR)/binutils-*" || rm -rf $(BUILDDIR)/binutils-*
 	test -z "$(BUILDDIR)/bin" || rm -rf $(BUILDDIR)/bin/*
-	test -z "$(BUILDDIR)/include/c++" || rm -rf $(BUILDDIR)/include/c++
+	test -z "$(BUILDDIR)/include" || rm -rf $(BUILDDIR)/include/*
 	test -z "$(BUILDDIR)/lib" || rm -rf $(BUILDDIR)/lib/*
 	test -z "$(BUILDDIR)/libexec" || rm -rf $(BUILDDIR)/libexec/*
 

Modified: branches/ooo-build-3-0/bin/setup.in
==============================================================================
--- branches/ooo-build-3-0/bin/setup.in	(original)
+++ branches/ooo-build-3-0/bin/setup.in	Tue Sep 30 14:35:48 2008
@@ -199,16 +199,16 @@
 # ---------------------------
 #   Source / Version setup:
 # ---------------------------
-GCC_VER=gcc-3.4.1
-GCC_TARBALL=gcc-3.4.1.tar.bz2
+GCC_VER=gcc-4.2.3
+GCC_TARBALL=gcc-4.2.3.tar.bz2
 GCC_UNTAR_OPTIONS=jxf
 GCC_DECOMPRESS_CMD="bzip2 -dc"
-GCC_PATCHES="gcc-3.4.1-Enums.diff gcc-3.4.1-VisibilityPatch2.diff"
+GCC_PATCHES=""
 
-BINUTILS_VER=
-BINUTILS_TARBALL=
-BINUTILS_UNTAR_OPTIONS=
-BINUTILS_DECOMPRESS_CMD=
+BINUTILS_VER=binutils-2.18
+BINUTILS_TARBALL=binutils-2.18.tar.bz2
+BINUTILS_UNTAR_OPTIONS=jxf
+BINUTILS_DECOMPRESS_CMD="bzip2 -dc"
 BINUTILS_PATCH=
 
 OOO_SCALED_ICONS_VER=ooo-scaled-icons

Modified: branches/ooo-build-3-0/configure.in
==============================================================================
--- branches/ooo-build-3-0/configure.in	(original)
+++ branches/ooo-build-3-0/configure.in	Tue Sep 30 14:35:48 2008
@@ -54,8 +54,7 @@
 
 AC_ARG_WITH(internal-gcc,
 [
-  --with-internal-gcc     build our own gcc (gcc-3.4.1 with enum and
-			  visibility patches).],
+  --with-internal-gcc     build our own gcc (gcc-4.2.3 vanilla).],
 ,)
 
 AC_ARG_WITH(distro,

Modified: branches/ooo-build-3-0/download.in
==============================================================================
--- branches/ooo-build-3-0/download.in	(original)
+++ branches/ooo-build-3-0/download.in	Tue Sep 30 14:35:48 2008
@@ -213,7 +213,7 @@
 -x $WGET || die "Can't find wget - install it and try again\n";
 
 if ('@SYSTEM_GCC@' eq '') {
-    push @files, ( 'gcc-3.4.1.tar.bz2', 'gcc-3.4.1-Enums.diff', 'gcc-3.4.1-VisibilityPatch2.diff' );
+    push @files, ( 'gcc-4.2.3.tar.bz2', 'binutils-2.18.tar.bz2' );
 }
 
 if (!$SPLIT && ($download_all || '@BUILD_WIN32@' ne ''))