diff options
Diffstat (limited to 'editors/openoffice.org-3-RC')
| -rw-r--r-- | editors/openoffice.org-3-RC/Makefile | 3 | ||||
| -rw-r--r-- | editors/openoffice.org-3-RC/files/patch-i98714 (renamed from editors/openoffice.org-3-RC/files/amd64-gcc42-workaround) | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/editors/openoffice.org-3-RC/Makefile b/editors/openoffice.org-3-RC/Makefile index 2e1d4cb9e0d3..a6d83141d679 100644 --- a/editors/openoffice.org-3-RC/Makefile +++ b/editors/openoffice.org-3-RC/Makefile @@ -151,9 +151,6 @@ 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/patch-i98714 index 01ace4ad728c..50cecadf6ede 100644 --- a/editors/openoffice.org-3-RC/files/amd64-gcc42-workaround +++ b/editors/openoffice.org-3-RC/files/patch-i98714 @@ -7,7 +7,7 @@ -# 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" ++.IF "$(OUTPATH)"=="unxfbsdx" || "$(OUTPATH)"=="unxfbsdi" || "$(OUTPATH)"=="unxlngx6" NOOPTFILES= \ $(SLO)$/qnametostr.obj .ENDIF |