Make openoffice compile with gcc from ports, or just with CC=$CC and

CXX=$CXX, like it should normally be. Usable options are:

USEPORTGCC295=YES, USEPORTGCC31=YES and USEPORTGCC32=YES

Add a lot off gcc3.x fixes, make included stlport compile with CURRENT.

Next step will be to include a mozilla build, so we can link openoffice
against mozilla librarys without c++ compat problems.

1 files changed, 90 insertions, 7 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 c580d786d05c..fecb7f038d50 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,5 +1,5 @@
---- configure.in.orig	Wed Mar 27 20:32:56 2002
-+++ configure.in	Tue Apr  2 23:56:37 2002
+--- configure.in.orig	Wed Apr 17 22:37:42 2002
++++ configure.in	Tue May 28 11:44:41 2002
 @@ -103,6 +103,12 @@
  
                            Usage: --with-asm-home=<path to ml.exe directory>
@@ -13,6 +13,15 @@
  AC_ARG_WITH(unzip-home,
  [  --with-unzip-home         For Windows users, please supply the path for 
                            unzip.exe.
+@@ -241,7 +247,7 @@
+ if test "$_os" != "WINNT" && test -z "$with_gcc_home"; then
+    AC_PROG_CC
+ fi
+-if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" -o \( \( "$_os" = "IRIX" -o "$_os" = "IRIX64" \) -a "$CC" = "gcc" \) ; then
++if test "$_os" = "Linux" -o "$_os" = "NetBSD" -o \( \( "$_os" = "IRIX" -o "$_os" = "IRIX64" \) -a "$CC" = "gcc" \) ; then
+    dnl ******************************************
+    dnl Testing for GNU compiler and version...
+    dnl ******************************************
 @@ -277,13 +283,13 @@
  
     if test $GCC; then
@@ -46,17 +55,91 @@
                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 @@
+@@ -366,8 +372,9 @@
+                      _gcc_include_path="NO_GCC_INCLUDE"
                    fi
                 else
- 		if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
+-		if test "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
 -                  _gcc_include_path="/usr/include/g++"
++		if test "$_os" = "NetBSD" ; then
 +                  _gcc_include_path="/usr"
 +                  _gxx_include_path="/usr/include/g++"
  		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
-@@ -815,6 +822,10 @@
+@@ -408,6 +415,71 @@
+       fi
+    fi
+ fi
++if test "$_os" = "FreeBSD"; then
++       dnl ******************************************
++       dnl Testing for GNU compiler and version...
++       dnl Adapted to the FreeBSD ports system
++       dnl ******************************************
++       dnl parametrise the various gcc pathnames so we can reuse for gcc2.95 and gcc3
++       if test -n "$enable_gcc3"; then
++               _gccincname1="g++-v3"
++       else
++               _gccincname1="g++-3"
++       fi
++       if test -z "$CC"; then
++               CC="cc";
++       fi
++       if test -z "$CXX"; then
++               CXX="c++";
++       fi
++       if which $CC; then
++               _gcc_releasetype=`echo $CC | $SED -e 's|[[:digit:]]\{1,\}||'`
++               _gcc_version=`$CC -dumpversion`
++               _gcc_major=`$CC -dumpversion | $AWK -F"." '{ print \$1 }'`
++               _gcc_machine=`$CC -dumpmachine`
++       else
++               COMPATH="NO_GCC"
++       fi
++       if test -n "$enable_gcc3"; then
++               if test "$_gcc_major" != "3"; then
++                       AC_MSG_ERROR([found version "$_gcc_version", but use of gcc 3.x requested])
++                       COMPATH="NO_GCC"
++               fi
++       else
++               if test "$_gcc_major" != "2"; 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_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=`$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
++                                       COMPATH="NO_GCC"
++                               fi
++                       fi
++               fi
++       fi
++       if test "$COMPATH" != "NO_GCC"; then
++               if test $CC != "gcc" -o $CC != "cc"; then
++                       _gcc_include_path="$PREFIX/lib/gcc-lib/$_gcc_machine/$_gcc_version/include"
++                       _gxx_include_path="$_gcc_include_path/g++"
++               else
++                       _gcc_include_path="$PREFIX"
++                       _gxx_include_path="$_gcc_include_path/g++"
++               fi
++       else
++               AC_MSG_WARN([no gcc compiler found])
++               AC_MSG_WARN([no gcc compiler found]) >> warn
++       fi
++fi
++
+ if test "$_os" = "Darwin"; then
+    if test "$CC" = "cc"; then
+       AC_PATH_PROGS(_cc, cc)
+@@ -815,6 +887,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,12 +150,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" }'`
-@@ -1182,7 +1193,7 @@
+@@ -1201,7 +1277,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 $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
++   './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 $CC $CXX
  else
     echo
     echo Test Complete