From e984906dae45a562c9641851a7a6edd3d7d53df5 Mon Sep 17 00:00:00 2001
From: jkim <jkim@FreeBSD.org>
Date: Wed, 3 Sep 2008 17:53:30 +0000
Subject: Add a workaround for amd64 and GCC 4.2.

Approved by:	maho (amd64 blanket)
---
 editors/openoffice.org-3-RC/Makefile                     |  3 +++
 editors/openoffice.org-3-RC/files/amd64-gcc42-workaround | 13 +++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 editors/openoffice.org-3-RC/files/amd64-gcc42-workaround

(limited to 'editors/openoffice.org-3-RC')

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
-- 
cgit