diff options
-rw-r--r-- | editors/lyx-qt/Makefile.common | 20 | ||||
-rw-r--r-- | math/octave/Makefile | 16 | ||||
-rw-r--r-- | textproc/sp/Makefile | 10 | ||||
-rw-r--r-- | www/mozilla/Makefile.common | 4 |
4 files changed, 25 insertions, 25 deletions
diff --git a/editors/lyx-qt/Makefile.common b/editors/lyx-qt/Makefile.common index 6b8295efaf3..2b19758d778 100644 --- a/editors/lyx-qt/Makefile.common +++ b/editors/lyx-qt/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.12 2004/02/01 01:43:29 jlam Exp $ +# $NetBSD: Makefile.common,v 1.13 2004/02/09 03:26:39 jlam Exp $ # DISTNAME= lyx-1.3.3 @@ -39,20 +39,22 @@ CONFIGURE_ARGS+= --with-pspell-lib=${BUILDLINK_PREFIX.aspell}/lib \ .include "../../mk/bsd.prefs.mk" # XXX these values are taken from the LyX configure script -.if defined(CC_VERSION) -. if !empty(CC_VERSION:Mgcc-2.95.1) -CXXFLAGS+= -fpermissive -ftemplate-depth-30 +.if !empty(CC_VERSION:Mgcc-*) +. if !empty(CC_VERSION:Mgcc-2.8*) +CXXFLAGS+= # empty +. elif !empty(CC_VERSION:Mgcc-2.95.1) +CXXFLAGS+= -fpermissive -ftemplate-depth-30 . elif !empty(CC_VERSION:Mgcc-2.95.*) -CXXFLAGS+= -Wno-non-template-friend -ftemplate-depth-30 +CXXFLAGS+= -Wno-non-template-friend -ftemplate-depth-30 . elif !empty(CC_VERSION:Mgcc-2.96*) # some Linux distros -CXXFLAGS+= -fno-exceptions -ftemplate-depth-30 -Wno-non-template-friend +CXXFLAGS+= -fno-exceptions -ftemplate-depth-30 -Wno-non-template-friend . elif !empty(CC_VERSION:Mgcc-3.0*) -# no op +CXXFLAGS+= # empty . elif !empty(CC_VERSION:Mgcc-3.1*) -CXXFLAGS+= -finline-limit=500 -fno-exceptions +CXXFLAGS+= -finline-limit=500 -fno-exceptions . else # >= 3.2 -CXXFLAGS+= -fno-exceptions +CXXFLAGS+= -fno-exceptions . endif .endif diff --git a/math/octave/Makefile b/math/octave/Makefile index 7f06127d607..72bf400ca98 100644 --- a/math/octave/Makefile +++ b/math/octave/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2004/01/27 00:53:11 heinz Exp $ +# $NetBSD: Makefile,v 1.44 2004/02/09 03:26:39 jlam Exp $ # FreeBSD Id: Makefile,v 1.18 1998/09/27 20:10:45 steve Exp DISTNAME= octave-2.0.17 @@ -56,13 +56,13 @@ PKG_FAIL_REASON= "Octave does not build with ${CC_VERSION} - please use octave-c .endif post-patch: -.if !empty(CC_VERSION:Megcs*) - @EGCS_VERSION=`${CC} -v 2>&1 | ${AWK} '{print $$4}'`; \ - if [ $$EGCS_VERSION -lt 19981201 ]; then \ - cd ${WRKSRC}; \ - for FILE in ${PATCHDIR}/egcs-patch-*; do \ - ${PATCH} ${PATCH_ARGS} <$$FILE; \ - done; \ +.if !empty(CC_VERSION:Mgcc-2.8.1) + @EGCS_VERSION=`${CC} -v 2>&1 | ${AWK} '{print $$4}'`; \ + if [ $$EGCS_VERSION -lt 19981201 ]; then \ + cd ${WRKSRC}; \ + for FILE in ${PATCHDIR}/egcs-patch-*; do \ + ${PATCH} ${PATCH_ARGS} < $$FILE; \ + done; \ fi .endif diff --git a/textproc/sp/Makefile b/textproc/sp/Makefile index 2db0232591a..a4bc190a1de 100644 --- a/textproc/sp/Makefile +++ b/textproc/sp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2004/01/23 17:18:32 jmmv Exp $ +# $NetBSD: Makefile,v 1.15 2004/02/09 03:26:39 jlam Exp $ # DISTNAME= sp-1.3.4 @@ -34,10 +34,10 @@ post-install: .include "../../mk/bsd.prefs.mk" post-patch: -.if !empty(CC_VERSION:Megcs*) - @cd ${WRKSRC}; - for FILE in ${PATCHDIR}/egcs-patch-*; do \ - ${PATCH} ${PATCH_ARGS} <$$FILE; \ +.if !empty(CC_VERSION:Mgcc-2.8.1) + @cd ${WRKSRC}; \ + for FILE in ${PATCHDIR}/egcs-patch-*; do \ + ${PATCH} ${PATCH_ARGS} < $$FILE; \ done .endif diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common index cf597dc1822..e7d08ad3fc9 100644 --- a/www/mozilla/Makefile.common +++ b/www/mozilla/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.31 2004/02/05 17:29:06 jmmv Exp $ +# $NetBSD: Makefile.common,v 1.32 2004/02/09 03:26:39 jlam Exp $ MOZ_DIST_VER?= ${MOZ_VER} DISTNAME?= mozilla-source-${MOZ_DIST_VER} @@ -124,8 +124,6 @@ PTHREAD_OPTS+= native optional .if !empty(CC_VERSION:Mgcc*) COPTS?= -O2 -.else -COPTS?= -O .endif CONFIGURE_ARGS+= --enable-optimize=${COPTS:Q} |