diff options
| author | cvs2svn <cvs2svn@FreeBSD.org> | 2009-11-14 12:33:33 +0000 |
|---|---|---|
| committer | cvs2svn <cvs2svn@FreeBSD.org> | 2009-11-14 12:33:33 +0000 |
| commit | cc415305a049ca523f2a8cf674009fa77c54fee6 (patch) | |
| tree | 6cf30da0266c6ffa712f243cc23f3c1b5c4a4fb8 /editors/openoffice-3/files/patch-i91369 | |
| parent | - Now fix to use this port on !i386. (diff) | |
This commit was manufactured by cvs2svn to create tag 'RELEASE_8_0_0'.release/8.0.0
Diffstat (limited to 'editors/openoffice-3/files/patch-i91369')
| -rw-r--r-- | editors/openoffice-3/files/patch-i91369 | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/editors/openoffice-3/files/patch-i91369 b/editors/openoffice-3/files/patch-i91369 deleted file mode 100644 index d042a4cb5e0f..000000000000 --- a/editors/openoffice-3/files/patch-i91369 +++ /dev/null @@ -1,25 +0,0 @@ -#FBSD7+amd64+gcc421 is okay without the patch (w/o -lsupc++ is fine) -#FBSD6+amd64+gcc342 is okay with the patch (w/o -lsupc++ is fine) - ...-lsupc++ is static, and cannot find -lgcc_s -#FBSD6+i386+gcc342 is okay with the patch (w/o -lsupc++ -lgcc_s is fine) - cannot find -lgcc_s - ---- store/util/makefile.mk.orig 2007-12-12 22:23:13.000000000 +0900 -+++ store/util/makefile.mk 2008-08-16 20:52:44.000000000 +0900 -@@ -76,6 +76,7 @@ - .ENDIF - - # On gcc3 __Unwind_SetIP is not in supc++ but in libgcc_s.so -+# FBSD6+amd64+gcc342 does not require -lsupc++. only libsupc++.a is supplied - .IF "$(COMID)"=="gcc3" && "$(GUI)"!="OS2" - .IF "$(GUI)"=="WNT" - SHL1STDLIBS+= -lsupc++ -@@ -86,6 +87,8 @@ - .IF "$(CCNUMVER)"<="000399999999" - SHL1STDLIBS+= -lsupc++ - .ENDIF # CCNUMVER -+.ELIF "$(OS)"=="FREEBSD" -+SHL1STDLIBS+= - .ELIF "$(CCNUMVER)"<="000400000999" - SHL1STDLIBS+= -lsupc++ -lgcc_s - .ENDIF |