diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2003-01-21 17:29:30 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2003-01-21 17:29:30 +0000 |
| commit | 7f3638c4575c3eff55e0c73153b1d7d5467a2643 (patch) | |
| tree | e538c98db38a36069dd5ebbafe7f30dc940c5e3c | |
| parent | Do not define USE_LANG if it is already set. (diff) | |
There is still no USE_GCC=3.2 version in our port build files. There
is really nothing I can do about this. So let us hardcode everything.
Notes
Notes:
svn path=/head/; revision=73736
| -rw-r--r-- | editors/openoffice-1.0/Makefile | 9 | ||||
| -rw-r--r-- | editors/openoffice.org-1.0/Makefile | 9 | ||||
| -rw-r--r-- | editors/openoffice/Makefile | 9 |
3 files changed, 12 insertions, 15 deletions
diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile index d98eda3309ef..697540671fe2 100644 --- a/editors/openoffice-1.0/Makefile +++ b/editors/openoffice-1.0/Makefile @@ -87,14 +87,13 @@ LANG_SORTED= `${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -` # # OO build is broken with the system gcc on STABLE. # -USE_GCC=3.1 -.else +BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32 +CC= gcc32 +CXX= g++32 +USE_GCC=3.2 .endif .if ${OSVERSION} > 500000 -# -# OO is still broken with the system gcc on CURRENT. -# .if defined(USE_GCC) && ${USE_GCC} == 3.2 BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32 CC= gcc32 diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile index d98eda3309ef..697540671fe2 100644 --- a/editors/openoffice.org-1.0/Makefile +++ b/editors/openoffice.org-1.0/Makefile @@ -87,14 +87,13 @@ LANG_SORTED= `${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -` # # OO build is broken with the system gcc on STABLE. # -USE_GCC=3.1 -.else +BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32 +CC= gcc32 +CXX= g++32 +USE_GCC=3.2 .endif .if ${OSVERSION} > 500000 -# -# OO is still broken with the system gcc on CURRENT. -# .if defined(USE_GCC) && ${USE_GCC} == 3.2 BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32 CC= gcc32 diff --git a/editors/openoffice/Makefile b/editors/openoffice/Makefile index d98eda3309ef..697540671fe2 100644 --- a/editors/openoffice/Makefile +++ b/editors/openoffice/Makefile @@ -87,14 +87,13 @@ LANG_SORTED= `${ECHO} ${LANG_LIST} | ${TR} " " "\n" | ${PASTE} -d " " - -` # # OO build is broken with the system gcc on STABLE. # -USE_GCC=3.1 -.else +BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32 +CC= gcc32 +CXX= g++32 +USE_GCC=3.2 .endif .if ${OSVERSION} > 500000 -# -# OO is still broken with the system gcc on CURRENT. -# .if defined(USE_GCC) && ${USE_GCC} == 3.2 BUILD_DEPENDS+= gcc32:${PORTSDIR}/lang/gcc32 CC= gcc32 |