diff options
author | Maho Nakata <maho@FreeBSD.org> | 2006-10-09 20:54:55 +0000 |
---|---|---|
committer | Maho Nakata <maho@FreeBSD.org> | 2006-10-09 20:54:55 +0000 |
commit | ca90bbc2941230a83386090180c153fffdca3f58 (patch) | |
tree | c84fe89802b5bd32d79a67a08d179a494be99a5c /editors | |
parent | a7fbf533a94deae6fc7ed54996c730c7d27c7fc4 (diff) | |
download | ports-ca90bbc2941230a83386090180c153fffdca3f58.tar.gz ports-ca90bbc2941230a83386090180c153fffdca3f58.zip |
Notes
Diffstat (limited to 'editors')
-rw-r--r-- | editors/openoffice.org-1.1-devel/Makefile | 13 | ||||
-rw-r--r-- | editors/openoffice.org-1.1/Makefile | 13 |
2 files changed, 12 insertions, 14 deletions
diff --git a/editors/openoffice.org-1.1-devel/Makefile b/editors/openoffice.org-1.1-devel/Makefile index 3805fbb9206a..b89aedaa96dd 100644 --- a/editors/openoffice.org-1.1-devel/Makefile +++ b/editors/openoffice.org-1.1-devel/Makefile @@ -107,16 +107,15 @@ PKGNAMEPREFIX= ${LANG_PKGNAME}- PKGNAMESUFFIX?= -${LANG_SUFFIX} .endif -BUILD_DEPENDS+= gcc33:${PORTSDIR}/lang/gcc33 -RUN_DEPENDS+= gcc33:${PORTSDIR}/lang/gcc33 +BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32 # FIXME (correctly add ccache before gcc and g++) .if defined(WITH_CCACHE) BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache -CC= ccache gcc33 -CXX= ccache g++33 +CC= ccache gcc32 +CXX= ccache g++32 .else -CC= gcc33 -CXX= g++33 +CC= gcc32 +CXX= g++32 .endif BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \ unzip:${PORTSDIR}/archivers/unzip \ @@ -135,7 +134,7 @@ TCSH?= /bin/tcsh PKGMESSAGE= ${WRKDIR}/pkg-message NUMOFPROCESSES?= 1 -CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --enable-pasf --enable-crashdump --enable-symbols=SMALL +CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --enable-pasf #--enable-crashdump --enable-symbols=SMALL #gcc3.2.3 is broken with -g1 .include <${FILESDIR}/Makefile.knobs> diff --git a/editors/openoffice.org-1.1/Makefile b/editors/openoffice.org-1.1/Makefile index 9739e763f3a9..dab83557db49 100644 --- a/editors/openoffice.org-1.1/Makefile +++ b/editors/openoffice.org-1.1/Makefile @@ -107,16 +107,15 @@ PKGNAMEPREFIX= ${LANG_PKGNAME}- PKGNAMESUFFIX?= -${LANG_SUFFIX} .endif -BUILD_DEPENDS+= gcc33:${PORTSDIR}/lang/gcc33 -RUN_DEPENDS+= gcc33:${PORTSDIR}/lang/gcc33 +BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32 # FIXME (correctly add ccache before gcc and g++) .if defined(WITH_CCACHE) BUILD_DEPENDS+= ccache:${PORTSDIR}/devel/ccache -CC= ccache gcc33 -CXX= ccache g++33 +CC= ccache gcc32 +CXX= ccache g++32 .else -CC= gcc33 -CXX= g++33 +CC= gcc32 +CXX= g++32 .endif BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \ unzip:${PORTSDIR}/archivers/unzip \ @@ -135,7 +134,7 @@ TCSH?= /bin/tcsh PKGMESSAGE= ${WRKDIR}/pkg-message NUMOFPROCESSES?= 1 -CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --enable-pasf --enable-crashdump --enable-symbols=SMALL +CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --enable-pasf #--enable-crashdump --enable-symbols=SMALL #gcc3.2.3 is broken with -g1 .include <${FILESDIR}/Makefile.knobs> |