diff options
| author | grant <grant@pkgsrc.org> | 2004-01-22 08:57:03 +0000 |
|---|---|---|
| committer | grant <grant@pkgsrc.org> | 2004-01-22 08:57:03 +0000 |
| commit | 3ab280cb9c8b556ced9947fef27fb456a384c620 (patch) | |
| tree | 59d8fc03fb6b6236e348e5403a440b5b117b258e /misc/openoffice | |
| parent | 05765496d1f08004540f3aa26b868a791bd790a3 (diff) | |
| download | pkgsrc-3ab280cb9c8b556ced9947fef27fb456a384c620.tar.gz | |
replace the (somewhat broken) test to figure out the compiler version
with GCC_REQD=2.95.2.
Diffstat (limited to 'misc/openoffice')
| -rw-r--r-- | misc/openoffice/Makefile | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/misc/openoffice/Makefile b/misc/openoffice/Makefile index 3fa23005304..aae7a0cd163 100644 --- a/misc/openoffice/Makefile +++ b/misc/openoffice/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2004/01/20 12:21:02 agc Exp $ +# $NetBSD: Makefile,v 1.43 2004/01/22 08:57:03 grant Exp $ DISTNAME= openoffice-0.0.0.641 PKGREVISION= 2 @@ -19,24 +19,8 @@ USE_BUILDLINK2= yes .include "../../mk/bsd.prefs.mk" -# OpenOffice requires gcc 2.95.2 or better, -GCC_VERSION!= ${CC} --version -.if (${GCC_VERSION} != "2.95.2") && (${GCC_VERSION} != "2.95.3") -BUILD_DEPENDS+= gcc>=2.95.3:../../lang/gcc -. if ${OPSYS} == "SunOS" -GCCPREFIX= ${LOCALBASE} -CC= ${GCCPREFIX}/bin/gcc -CXX= ${GCCPREFIX}/bin/g++ -. else -GCCPREFIX= ${LOCALBASE}/gcc-2.95.3 -CC= ${GCCPREFIX}/bin/cc -CXX= ${GCCPREFIX}/bin/c++ -. endif -CPP= ${GCCPREFIX}/bin/cpp -F77= ${GCCPREFIX}/bin/g77 -PKG_FC= ${GCCPREFIX}/bin/g77 -LDFLAGS+= ${RPATH_FLAG}${GCCPREFIX}/lib -.endif +# OpenOffice requires gcc 2.95.2 or better. +GCC_REQD= 2.95.2 BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison BUILD_DEPENDS+= {standalone-tcsh,tcsh}-[0-9]*:../../shells/tcsh |