aboutsummaryrefslogtreecommitdiffstats
path: root/editors/openoffice-3
diff options
context:
space:
mode:
authormaho <maho@FreeBSD.org>2008-08-16 21:00:22 +0800
committermaho <maho@FreeBSD.org>2008-08-16 21:00:22 +0800
commit97343b6ec7155c8c8f6222bb977a9d1ba99fdbe0 (patch)
tree0dfacf020bd6a112cb8b20a8092ce6b6bde56b54 /editors/openoffice-3
parent5da4e68c98ace32922c8cd1a40bd7b803a883934 (diff)
downloadfreebsd-ports-gnome-97343b6ec7155c8c8f6222bb977a9d1ba99fdbe0.tar.gz
freebsd-ports-gnome-97343b6ec7155c8c8f6222bb977a9d1ba99fdbe0.tar.zst
freebsd-ports-gnome-97343b6ec7155c8c8f6222bb977a9d1ba99fdbe0.zip
A build fix.
Diffstat (limited to 'editors/openoffice-3')
-rw-r--r--editors/openoffice-3/files/patch-i9136925
1 files changed, 25 insertions, 0 deletions
diff --git a/editors/openoffice-3/files/patch-i91369 b/editors/openoffice-3/files/patch-i91369
new file mode 100644
index 000000000000..d042a4cb5e0f
--- /dev/null
+++ b/editors/openoffice-3/files/patch-i91369
@@ -0,0 +1,25 @@
+#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