diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2008-08-16 13:00:22 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2008-08-16 13:00:22 +0000 |
| commit | eeaaf3ac3da6f3b9c20d156e00891497b130158f (patch) | |
| tree | 6a4b5f0f7e0b3d379df5a5d7f3164ea21c3ba330 /editors/openoffice.org-2-devel/files | |
| parent | Add p5-Test-Memory-Cycle 1.04, check for memory leaks and circular (diff) | |
A build fix.
Notes
Notes:
svn path=/head/; revision=218669
Diffstat (limited to 'editors/openoffice.org-2-devel/files')
| -rw-r--r-- | editors/openoffice.org-2-devel/files/patch-i91369 | 33 |
1 files changed, 21 insertions, 12 deletions
diff --git a/editors/openoffice.org-2-devel/files/patch-i91369 b/editors/openoffice.org-2-devel/files/patch-i91369 index f1de25ebdfad..d042a4cb5e0f 100644 --- a/editors/openoffice.org-2-devel/files/patch-i91369 +++ b/editors/openoffice.org-2-devel/files/patch-i91369 @@ -1,16 +1,25 @@ -Index: store/util/makefile.mk -=================================================================== -RCS file: /cvs/ucb/store/util/makefile.mk,v -retrieving revision 1.24 -diff -u -r1.24 makefile.mk ---- store/util/makefile.mk 10 Apr 2008 14:23:47 -0000 1.24 -+++ store/util/makefile.mk 30 Jun 2008 23:52:56 -0000 -@@ -78,7 +78,7 @@ - .ELSE - .IF "$(OS)"=="NETBSD" +#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++ --.ELIF "$(OS)"=="MACOSX" -+.ELIF "$(OS)"=="MACOSX" || "$(OS)"=="FREEBSD" +@@ -86,6 +87,8 @@ .IF "$(CCNUMVER)"<="000399999999" SHL1STDLIBS+= -lsupc++ .ENDIF # CCNUMVER ++.ELIF "$(OS)"=="FREEBSD" ++SHL1STDLIBS+= + .ELIF "$(CCNUMVER)"<="000400000999" + SHL1STDLIBS+= -lsupc++ -lgcc_s + .ENDIF |