diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2002-07-07 08:42:33 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2002-07-07 08:42:33 +0000 |
| commit | 9d052c77012eebd7074594f324b2e6a645d4e9d9 (patch) | |
| tree | 73aa68181eb3d9c4519da0945e8a22d6fa91d28c /editors | |
| parent | Add l5 1.2, file Integrity Assessment Tool. (diff) | |
- Remove bogus dependency on pth
- Use USE_GCC=3.1 in STABLE cause gcc 2.95.4 is broken again
for the OO.org build.
Notes
Notes:
svn path=/head/; revision=62548
Diffstat (limited to 'editors')
| -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, 24 insertions, 3 deletions
diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile index cd7f903c7cec..d4f17cb0aaad 100644 --- a/editors/openoffice-1.0/Makefile +++ b/editors/openoffice-1.0/Makefile @@ -49,6 +49,14 @@ DESCR= ${.CURDIR}/pkg-descr LANG_EXT=01 .endif +.if ${OSVERSION} < 500000 +# +# OO build is broken with the system gcc on STABLE. +# +USE_GCC=3.1 +.else +.endif + .if ${OSVERSION} > 500000 # # OO is still broken with the system gcc on CURRENT. @@ -89,7 +97,6 @@ BUILD_DEPENDS+= imake:${PORTSDIR}/devel/imake-4 .if !defined(DISPLAY) BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer .endif -LIB_DEPENDS+= pth.14:${PORTSDIR}/devel/pth USE_PERL5= yes USE_XLIB= yes diff --git a/editors/openoffice.org-1.0/Makefile b/editors/openoffice.org-1.0/Makefile index cd7f903c7cec..d4f17cb0aaad 100644 --- a/editors/openoffice.org-1.0/Makefile +++ b/editors/openoffice.org-1.0/Makefile @@ -49,6 +49,14 @@ DESCR= ${.CURDIR}/pkg-descr LANG_EXT=01 .endif +.if ${OSVERSION} < 500000 +# +# OO build is broken with the system gcc on STABLE. +# +USE_GCC=3.1 +.else +.endif + .if ${OSVERSION} > 500000 # # OO is still broken with the system gcc on CURRENT. @@ -89,7 +97,6 @@ BUILD_DEPENDS+= imake:${PORTSDIR}/devel/imake-4 .if !defined(DISPLAY) BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer .endif -LIB_DEPENDS+= pth.14:${PORTSDIR}/devel/pth USE_PERL5= yes USE_XLIB= yes diff --git a/editors/openoffice/Makefile b/editors/openoffice/Makefile index cd7f903c7cec..d4f17cb0aaad 100644 --- a/editors/openoffice/Makefile +++ b/editors/openoffice/Makefile @@ -49,6 +49,14 @@ DESCR= ${.CURDIR}/pkg-descr LANG_EXT=01 .endif +.if ${OSVERSION} < 500000 +# +# OO build is broken with the system gcc on STABLE. +# +USE_GCC=3.1 +.else +.endif + .if ${OSVERSION} > 500000 # # OO is still broken with the system gcc on CURRENT. @@ -89,7 +97,6 @@ BUILD_DEPENDS+= imake:${PORTSDIR}/devel/imake-4 .if !defined(DISPLAY) BUILD_DEPENDS+= Xvfb:${PORTSDIR}/x11-servers/XFree86-4-VirtualFramebufferServer .endif -LIB_DEPENDS+= pth.14:${PORTSDIR}/devel/pth USE_PERL5= yes USE_XLIB= yes |