diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2002-05-29 13:58:09 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2002-05-29 13:58:09 +0000 |
| commit | 6f36732a2d353e9a6c01b8e562cb718212ee6373 (patch) | |
| tree | af871a2034798c781931a15d1d2308119869a070 /editors/openoffice.org-2-RC/files/patch-stlport+makefile.mk | |
| parent | Remove krb5 from menu as it requires a path (diff) | |
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.
Notes
Notes:
svn path=/head/; revision=60246
Diffstat (limited to 'editors/openoffice.org-2-RC/files/patch-stlport+makefile.mk')
| -rw-r--r-- | editors/openoffice.org-2-RC/files/patch-stlport+makefile.mk | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/editors/openoffice.org-2-RC/files/patch-stlport+makefile.mk b/editors/openoffice.org-2-RC/files/patch-stlport+makefile.mk new file mode 100644 index 000000000000..c55d863b689f --- /dev/null +++ b/editors/openoffice.org-2-RC/files/patch-stlport+makefile.mk @@ -0,0 +1,32 @@ +--- ../stlport/makefile.mk.orig Tue Mar 19 15:49:17 2002 ++++ ../stlport/makefile.mk Tue May 28 23:03:45 2002 +@@ -106,11 +106,29 @@ + + .IF "$(COM)"=="GCC" + .IF "$(COMID)"=="gcc3" ++ ++.IF "$(OS)"=="FREEBSD" ++BUILD_FLAGS=-f gcc-3.0-freebsd.mak ++.ELSE + BUILD_FLAGS=-f gcc-3.0.mak ++.ENDIF ++ + .ELSE # "$(COMID)"=="gcc3" ++ ++.IF "$(OS)"=="FREEBSD" ++BUILD_FLAGS=-f gcc-freebsd.mak ++.ELSE + BUILD_FLAGS=-f gcc.mak ++.ENDIF ++ + .ENDIF # "$(COMID)"=="gcc3" ++ ++.IF "$(OS)"=="FREEBSD" ++BUILD_ACTION=gmake ++.ELSE + BUILD_ACTION=make ++.ENDIF ++ + .ENDIF + + .IF "$(COM)"=="C52" |