Upgrade to build 641d. More work is necessary to make the build compile.

There are still at least two different gcc bugs in our compiler, one
issue has already been found by Alexander Kabaev <ak03@gte.com>. He's
working on fixing the other.

1 files changed, 26 insertions, 41 deletions

diff --git a/editors/openoffice.org-2-RC/files/patch-config_office+configure.in b/editors/openoffice.org-2-RC/files/patch-config_office+configure.in
index 755c69de6129..c580d786d05c 100644
--- a/editors/openoffice.org-2-RC/files/patch-config_office+configure.in
+++ b/editors/openoffice.org-2-RC/files/patch-config_office+configure.in
@@ -1,6 +1,6 @@
---- configure.in.orig	Mon Nov 12 22:45:53 2001
-+++ configure.in	Sat Mar  9 23:08:27 2002
-@@ -98,6 +98,12 @@
+--- configure.in.orig	Wed Mar 27 20:32:56 2002
++++ configure.in	Tue Apr  2 23:56:37 2002
+@@ -103,6 +103,12 @@
  
                            Usage: --with-asm-home=<path to ml.exe directory>
  ],,)
@@ -13,7 +13,7 @@
  AC_ARG_WITH(unzip-home,
  [  --with-unzip-home         For Windows users, please supply the path for 
                            unzip.exe.
-@@ -225,13 +231,13 @@
+@@ -277,13 +283,13 @@
  
     if test $GCC; then
        AC_MSG_CHECKING([the GNU gcc compiler version])
@@ -29,24 +29,24 @@
 +         _gcc_version=`$CC --version`
        fi
        _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` 
-       if test "$_gcc_major" != "2"; then
-@@ -239,13 +245,13 @@
-          AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
-          COMPATH="NO_GCC"
-       else
--         _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` 
-+         _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` 
-          if test "$_gcc_middle" = "false"; then
-             AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler])
-             AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
-             COMPATH="NO_GCC"
-          else
--            _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` 
-+            _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` 
-             if test "$_gcc_minor" = "false"; then
-                AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler])
-                AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
-@@ -306,7 +312,8 @@
+       if test -n "$enable_gcc3"; then 
+@@ -296,13 +302,13 @@
+            AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
+            COMPATH="NO_GCC"
+         else
+-           _gcc_middle=`$GCC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` 
++           _gcc_middle=`$CC --version | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` 
+            if test "$_gcc_middle" = "false"; then
+               AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler])
+               AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
+               COMPATH="NO_GCC"
+            else
+-              _gcc_minor=`$GCC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` 
++              _gcc_minor=`$CC --version | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` 
+               if test "$_gcc_minor" = "false"; then
+                  AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler])
+                  AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
+@@ -367,7 +373,8 @@
                    fi
                 else
  		if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
@@ -56,7 +56,7 @@
  		else
                    AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler])
                    AC_MSG_WARN([could not find 2.95.2/include directory of the gcc compiler]) >> warn
-@@ -740,6 +747,10 @@
+@@ -815,6 +822,10 @@
     fi
     if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD"; then
        _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
@@ -67,27 +67,12 @@
     fi
     if test "$_os" = "Linux" -a "$_machine_type" = "sparc"; then
        _jdk_middle=`echo $_jdk | $AWK -F. '{ if ($2 != 2) print "false"; else print "true" }'`
-@@ -982,7 +993,7 @@
- 	HAVE_GPC_C="yes"
- fi
- 
--if test "$HAVE_GPC_H" == "yes" -a "$HAVE_GPC_C" == "yes"; then
-+if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then
- 	AC_MSG_RESULT([GPC files found])
- else
- 	AC_MSG_ERROR([GPC files not found])
-@@ -1084,12 +1095,13 @@
- echo "\$with_lang="$with_lang
- echo "\$with_asm_home="$with_asm_home
- echo "\$with_unzip_home="$with_unzip_home
-+echo "\$with_os_version="$with_os_version
- echo
- fi
+@@ -1182,7 +1193,7 @@
  
  # Executing the set_soenv script to setup the environment variables.
  if test -z "$enable_check_only"; then
--   './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home
-+   './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS
+-   './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3
++   './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $with_os_version $PTHREAD_CFLAGS $PTHREAD_LIBS
  else
     echo
     echo Test Complete