From 6f36732a2d353e9a6c01b8e562cb718212ee6373 Mon Sep 17 00:00:00 2001
From: Martin Blapp <mbr@FreeBSD.org>
Date: Wed, 29 May 2002 13:58:09 +0000
Subject: 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.
---
 .../files/patch-solenv::inc::settings.mk              | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 editors/openoffice-1.0/files/patch-solenv::inc::settings.mk

(limited to 'editors/openoffice-1.0/files/patch-solenv::inc::settings.mk')

diff --git a/editors/openoffice-1.0/files/patch-solenv::inc::settings.mk b/editors/openoffice-1.0/files/patch-solenv::inc::settings.mk
new file mode 100644
index 000000000000..ea6a898a9a6d
--- /dev/null
+++ b/editors/openoffice-1.0/files/patch-solenv::inc::settings.mk
@@ -0,0 +1,19 @@
+--- ../solenv/inc/settings.mk.orig	Fri Mar  8 10:23:21 2002
++++ ../solenv/inc/settings.mk	Tue May 28 12:56:27 2002
+@@ -166,7 +166,6 @@
+ CDEFSOPT=
+ HDEFS=
+ 
+-CC=
+ .IF "$(add_cflags)"!=""
+ ENVCFLAGS+=$(add_cflags)
+ .ENDIF
+@@ -264,8 +263,6 @@
+ AS=
+ BC=
+ COBOL=
+-CPP=
+-CXX=
+ FOR=
+ PASCAL=
+ 
-- 
cgit v1.2.3