diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2008-09-03 17:53:30 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2008-09-03 17:53:30 +0000 |
| commit | 513fae961cc06138fc731bf90aa0adee2d7f8f03 (patch) | |
| tree | 499833846e95c910dbc799299ef636758dba6327 | |
| parent | Remove a stale patch to fix the apply patch. (diff) | |
Add a workaround for amd64 and GCC 4.2.
Approved by: maho (amd64 blanket)
Notes
Notes:
svn path=/head/; revision=219787
Diffstat (limited to '')
| -rw-r--r-- | editors/openoffice-3-devel/Makefile | 3 | ||||
| -rw-r--r-- | editors/openoffice-3-devel/files/amd64-gcc42-workaround | 13 | ||||
| -rw-r--r-- | editors/openoffice.org-3-RC/Makefile | 3 | ||||
| -rw-r--r-- | editors/openoffice.org-3-RC/files/amd64-gcc42-workaround | 13 | ||||
| -rw-r--r-- | editors/openoffice.org-3-devel/Makefile | 3 | ||||
| -rw-r--r-- | editors/openoffice.org-3-devel/files/amd64-gcc42-workaround | 13 |
6 files changed, 48 insertions, 0 deletions
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile index 7dc42aff116f..bc9b8be8fdbe 100644 --- a/editors/openoffice-3-devel/Makefile +++ b/editors/openoffice-3-devel/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-3-devel/files/amd64-gcc42-workaround b/editors/openoffice-3-devel/files/amd64-gcc42-workaround new file mode 100644 index 000000000000..01ace4ad728c --- /dev/null +++ b/editors/openoffice-3-devel/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 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 diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile index 7dc42aff116f..bc9b8be8fdbe 100644 --- a/editors/openoffice.org-3-devel/Makefile +++ b/editors/openoffice.org-3-devel/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-devel/files/amd64-gcc42-workaround b/editors/openoffice.org-3-devel/files/amd64-gcc42-workaround new file mode 100644 index 000000000000..01ace4ad728c --- /dev/null +++ b/editors/openoffice.org-3-devel/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 |