diff options
| author | maho <maho@FreeBSD.org> | 2009-10-18 18:19:09 +0800 |
|---|---|---|
| committer | maho <maho@FreeBSD.org> | 2009-10-18 18:19:09 +0800 |
| commit | 27c5641291e766f8ca889b894b614a1198dde7dc (patch) | |
| tree | e5b4d65e63605e1d3635d96679e81d7f4d6ef88f /editors | |
| parent | 3c6c55024f0a92fd0a7b4df69c8bc13404f7df22 (diff) | |
| download | freebsd-ports-gnome-27c5641291e766f8ca889b894b614a1198dde7dc.tar.gz freebsd-ports-gnome-27c5641291e766f8ca889b894b614a1198dde7dc.tar.zst freebsd-ports-gnome-27c5641291e766f8ca889b894b614a1198dde7dc.zip | |
Fix build with nss on amd64.
Feature safe: yes.
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/openoffice-3-devel/Makefile | 4 | ||||
| -rw-r--r-- | editors/openoffice-3-devel/files/patch-i105977 | 17 | ||||
| -rw-r--r-- | editors/openoffice.org-3-devel/Makefile | 4 | ||||
| -rw-r--r-- | editors/openoffice.org-3-devel/files/patch-i105977 | 17 |
4 files changed, 36 insertions, 6 deletions
diff --git a/editors/openoffice-3-devel/Makefile b/editors/openoffice-3-devel/Makefile index ef68e3fa81e3..817d66b99864 100644 --- a/editors/openoffice-3-devel/Makefile +++ b/editors/openoffice-3-devel/Makefile @@ -110,7 +110,6 @@ CONFIGURE_ENV+= CC="${OOOCC}" CXX="${OOOCXX}" \ LDFLAGS="-L${LOCALBASE}/lib" \ PATH=${WRKSRC}/solenv/bin:$$PATH -LIB_DEPENDS= nss3:${PORTSDIR}/security/nss BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \ unzip:${PORTSDIR}/archivers/unzip \ gcp:${PORTSDIR}/sysutils/coreutils \ @@ -144,8 +143,7 @@ CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp \ --enable-presenter-console \ --enable-pdfimport \ --enable-wiki-publisher \ - --enable-report-builder \ - --disable-nss-module + --enable-report-builder OOOEXTENSIONS+= minimizer/sun-presentation-minimizer.oxt OOOEXTENSIONS+= presenter/presenter-screen.oxt diff --git a/editors/openoffice-3-devel/files/patch-i105977 b/editors/openoffice-3-devel/files/patch-i105977 new file mode 100644 index 000000000000..2a64e10e0fb0 --- /dev/null +++ b/editors/openoffice-3-devel/files/patch-i105977 @@ -0,0 +1,17 @@ +--- nss/makefile.mk~ 2009-10-18 14:50:43.000000000 +0900 ++++ nss/makefile.mk 2009-10-18 14:50:56.000000000 +0900 +@@ -65,6 +65,14 @@ + .ENDIF # "$(CPU)"=="X" + .ENDIF # "$(OS)$(COM)"=="LINUXGCC" + ++.IF "$(OS)$(COM)"=="FREEBSDGCC" ++.IF "$(CPU)"=="X" ++# force 64-bit buildmode ++USE_64:=1 ++.EXPORT : USE_64 ++.ENDIF # "$(CPU)"=="X" ++.ENDIF # "$(OS)$(COM)"=="LINUXGCC" ++ + + .IF "$(OS)"=="MACOSX" + .IF "$(EXTRA_CFLAGS)"!="" diff --git a/editors/openoffice.org-3-devel/Makefile b/editors/openoffice.org-3-devel/Makefile index ef68e3fa81e3..817d66b99864 100644 --- a/editors/openoffice.org-3-devel/Makefile +++ b/editors/openoffice.org-3-devel/Makefile @@ -110,7 +110,6 @@ CONFIGURE_ENV+= CC="${OOOCC}" CXX="${OOOCXX}" \ LDFLAGS="-L${LOCALBASE}/lib" \ PATH=${WRKSRC}/solenv/bin:$$PATH -LIB_DEPENDS= nss3:${PORTSDIR}/security/nss BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \ unzip:${PORTSDIR}/archivers/unzip \ gcp:${PORTSDIR}/sysutils/coreutils \ @@ -144,8 +143,7 @@ CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp \ --enable-presenter-console \ --enable-pdfimport \ --enable-wiki-publisher \ - --enable-report-builder \ - --disable-nss-module + --enable-report-builder OOOEXTENSIONS+= minimizer/sun-presentation-minimizer.oxt OOOEXTENSIONS+= presenter/presenter-screen.oxt diff --git a/editors/openoffice.org-3-devel/files/patch-i105977 b/editors/openoffice.org-3-devel/files/patch-i105977 new file mode 100644 index 000000000000..2a64e10e0fb0 --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-i105977 @@ -0,0 +1,17 @@ +--- nss/makefile.mk~ 2009-10-18 14:50:43.000000000 +0900 ++++ nss/makefile.mk 2009-10-18 14:50:56.000000000 +0900 +@@ -65,6 +65,14 @@ + .ENDIF # "$(CPU)"=="X" + .ENDIF # "$(OS)$(COM)"=="LINUXGCC" + ++.IF "$(OS)$(COM)"=="FREEBSDGCC" ++.IF "$(CPU)"=="X" ++# force 64-bit buildmode ++USE_64:=1 ++.EXPORT : USE_64 ++.ENDIF # "$(CPU)"=="X" ++.ENDIF # "$(OS)$(COM)"=="LINUXGCC" ++ + + .IF "$(OS)"=="MACOSX" + .IF "$(EXTRA_CFLAGS)"!="" |