ooo-build r14002 - in branches/ooo-build-3-0: . bin patches

[strba svn gnome org]

Author: strba
Date: Mon Sep 22 14:03:34 2008
New Revision: 14002
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14002&view=rev

Log:
revive internal gcc

Modified:
   branches/ooo-build-3-0/ChangeLog
   branches/ooo-build-3-0/Makefile.am
   branches/ooo-build-3-0/bin/build-ooo
   branches/ooo-build-3-0/configure.in
   branches/ooo-build-3-0/patches/apply.pl.in

Modified: branches/ooo-build-3-0/Makefile.am
==============================================================================
--- branches/ooo-build-3-0/Makefile.am	(original)
+++ branches/ooo-build-3-0/Makefile.am	Mon Sep 22 14:03:34 2008
@@ -24,6 +24,7 @@
 	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
 
 maintainer-clean-local:
 	test -z "$(BUILDDIR)" || rm -rf $(BUILDDIR)

Modified: branches/ooo-build-3-0/bin/build-ooo
==============================================================================
--- branches/ooo-build-3-0/bin/build-ooo	(original)
+++ branches/ooo-build-3-0/bin/build-ooo	Mon Sep 22 14:03:34 2008
@@ -86,6 +86,14 @@
 echo 'Bootstrapping'
 ./bootstrap || ./bootstrap || ./bootstrap || exit 1;
 
+# Copy in missing libraries if we just built them
+if test "z$SYSTEM_GCC" = "z"; then
+    echo "Copying libraries to $SOLARVER/$UPD/$INPATH/lib";
+    mkdir -p $SOLARVER/$UPD/$INPATH/lib || exit 1;
+    cp -avf $BUILDDIR/$LIB/libgcc* $BUILDDIR/$LIB/libstdc* $SOLARVER/$UPD/$INPATH/lib || exit 1;
+    cp -vf $BUILDDIR/$LIB/libstdc++* $SOLARVER/$UPD/$INPATH/lib/ || exit 1;
+fi
+
 echo 'Verifying environment'
 echo "Path:  \'$PATH\'"
 echo "Shell: \'$SHELL\'"

Modified: branches/ooo-build-3-0/configure.in
==============================================================================
--- branches/ooo-build-3-0/configure.in	(original)
+++ branches/ooo-build-3-0/configure.in	Mon Sep 22 14:03:34 2008
@@ -52,6 +52,12 @@
 			  of defaults suitable for that platform.],
 ,)
 
+AC_ARG_WITH(internal-gcc,
+[
+  --with-internal-gcc     build our own gcc (gcc-3.4.1 with enum and
+			  visibility patches).],
+,)
+
 AC_ARG_WITH(distro,
 [
   --with-distro           build with a specific distributions patch-set. There
@@ -619,6 +625,15 @@
    AC_MSG_ERROR( bison must be installed )
 fi
 
+if test "z$with_internal_gcc" = "zyes" ; then
+   SYSTEM_GCC=
+   gcc_to_use="internal (will be built)"
+else
+   SYSTEM_GCC=true
+   gcc_to_use="from system"
+fi
+AC_SUBST(SYSTEM_GCC)
+
 BUILD_NCPUS=1
 if test "z$with_num_cpus" != "z"; then
    BUILD_NCPUS=$with_num_cpus
@@ -1429,6 +1444,7 @@
 	distro:             $DISTRO
 	add sections:       ${OOO_ADDITIONAL_SECTIONS:-no}
 	widget sets:        ${widget_sets:-disabled}
+	gcc to use:         $gcc_to_use
 	openclipart:        ${OPENCLIPART_VER:-${OPENCLIPART_DIR:-no}}
 	mono bindings:	    $mono_enabled
 	mdbtools/access:    $access_enabled
@@ -1436,9 +1452,9 @@
 	ooo-install-dir:    $OOOINSTALLDIRNAME
 	ccache:             $ccache_message
 	icecream:           $icecream_message
-        max jobs:           $max_job_message
-	cairo:		    $cairo_enabled
-	build type:	    $build_product build
+	max jobs:           $max_job_message
+	cairo:              $cairo_enabled
+	build type:         $build_product build
 	download mirror:    $MIRROR
 
 To build run:

Modified: branches/ooo-build-3-0/patches/apply.pl.in
==============================================================================
--- branches/ooo-build-3-0/patches/apply.pl.in	(original)
+++ branches/ooo-build-3-0/patches/apply.pl.in	Mon Sep 22 14:03:34 2008
@@ -1118,7 +1118,7 @@
 
     $opts = join ' ', @arguments;
     my $base_args = " -l -p0 $opts -d $dest_dir";
-    $base_cmd = "patch";
+    $base_cmd = "@GNUPATCH@";
     if ($pieces) {
 	# nasty path mess
 	$base_cmd = "$patch_dir/../../bin/sloppypatch.pl";