aboutsummaryrefslogtreecommitdiff
path: root/editors/openoffice.org-3-RC
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2008-09-03 17:53:30 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2008-09-03 17:53:30 +0000
commit513fae961cc06138fc731bf90aa0adee2d7f8f03 (patch)
tree499833846e95c910dbc799299ef636758dba6327 /editors/openoffice.org-3-RC
parent4c5c03898fe3bc7c56240ad1dd9670299b431d41 (diff)
downloadports-513fae961cc06138fc731bf90aa0adee2d7f8f03.tar.gz
ports-513fae961cc06138fc731bf90aa0adee2d7f8f03.zip
Notes
Diffstat (limited to 'editors/openoffice.org-3-RC')
-rw-r--r--editors/openoffice.org-3-RC/Makefile3
-rw-r--r--editors/openoffice.org-3-RC/files/amd64-gcc42-workaround13
2 files changed, 16 insertions, 0 deletions
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile
index f1b00c41377c..8469804e8f36 100644
--- a/editors/openoffice.org-3-RC/Makefile
+++ b/editors/openoffice.org-3-RC/Makefile
@@ -150,6 +150,9 @@ CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp \
WITHOUT_MOZILLA= yes
LIB_DEPENDS+= boost_regex:${PORTSDIR}/devel/boost
CONFIGURE_ARGS+= --with-system-boost=yes #i58343#
+.if (${OSVERSION} >= 700042)
+EXTRA_PATCHES+= ${FILESDIR}/amd64-gcc42-workaround
+.endif
.endif
.if (${OSVERSION} <= 602102)
EXTRA_PATCHES+= ${FILESDIR}/rtld-workaround-i66667
diff --git a/editors/openoffice.org-3-RC/files/amd64-gcc42-workaround b/editors/openoffice.org-3-RC/files/amd64-gcc42-workaround
new file mode 100644
index 000000000000..01ace4ad728c
--- /dev/null
+++ b/editors/openoffice.org-3-RC/files/amd64-gcc42-workaround
@@ -0,0 +1,13 @@
+--- writerfilter/source/resourcemodel/makefile.mk.orig 2008-07-22 08:53:57.000000000 -0400
++++ writerfilter/source/resourcemodel/makefile.mk 2008-09-03 12:26:09.000000000 -0400
+@@ -56,8 +56,8 @@
+ $(SLO)$/TagLogger.obj \
+ $(SLO)$/WW8Analyzer.obj
+
+-# linux 64 bit: compiler (gcc 4.2.3) fails with 'out of memory'
+-.IF "$(OUTPATH)"=="unxlngx6"
++# FreeBSD/Linux 64-bit: compiler (gcc 4.2.x) fails with 'out of memory'
++.IF "$(OUTPATH)"=="unxfbsdx" || "$(OUTPATH)"=="unxlngx6"
+ NOOPTFILES= \
+ $(SLO)$/qnametostr.obj
+ .ENDIF