diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2002-06-13 05:19:50 +0800 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2002-06-13 05:19:50 +0800 |
| commit | b42d78ff3869ef2d31825d86943b032578775e5f (patch) | |
| tree | ae133284ea856bc6950954712410f5d7fca34119 /editors/openoffice-1.0/Makefile | |
| parent | 44f577242e395e723d50b2dafadc133531b5c326 (diff) | |
| download | freebsd-ports-b42d78ff3869ef2d31825d86943b032578775e5f.tar.gz freebsd-ports-b42d78ff3869ef2d31825d86943b032578775e5f.tar.zst freebsd-ports-b42d78ff3869ef2d31825d86943b032578775e5f.zip | |
Fix gcc 2.95.3 crash resulting from a symbol conflict
between libpackage2.so and libsvx641fi.so.
Enable gcc 2.95.3 build again. OO should build and work now
in STABLE with the system gcc.
Obtained from: Alexander Kabaev <ak03@gte.com>
Notes
Notes:
svn path=/head/; revision=61176
Diffstat (limited to 'editors/openoffice-1.0/Makefile')
| -rw-r--r-- | editors/openoffice-1.0/Makefile | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/editors/openoffice-1.0/Makefile b/editors/openoffice-1.0/Makefile index a89d94e8234b..43065f3a359e 100644 --- a/editors/openoffice-1.0/Makefile +++ b/editors/openoffice-1.0/Makefile @@ -19,16 +19,8 @@ DISTFILES= OOo_${PORTVERSION}_source.tar.bz2 gpc231.tar.Z \ .include <bsd.port.pre.mk> -# -# The OO build is broken with system gcc at the moment. -# You can override this. -# -.if !defined(USE_GCC) -USE_GCC=3.1 -.endif - .if ${OSVERSION} > 500000 -.if ${USE_GCC} == 3.1 +.if defined(USE_GCC) && ${USE_GCC} == 3.1 # # We depend on the port. System g++ is broken at the moment. # @@ -164,7 +156,7 @@ pre-fetch: @${ECHO} stable as it should. @${ECHO} @${ECHO} KERNEL CONFIGURATION: -.if ${USE_GCC} == 2.95 +.if defined(USE_GCC) && ${USE_GCC} == 2.95 @${ECHO} @${ECHO} Openoffice needs a larger stack- and @${ECHO} datasize to build. Check your limit |