From 7422a82dcf0240d929f2f566a3f2232920d777a1 Mon Sep 17 00:00:00 2001 From: sketch Date: Tue, 23 Dec 2003 10:35:30 +0000 Subject: Use compiler.mk logic to determine the correct compiler to use, and clean up the pattern matching. Fixes build warnings on systems which do not use GCC. --- audio/festival/Makefile | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) (limited to 'audio/festival') diff --git a/audio/festival/Makefile b/audio/festival/Makefile index 181ba61aa23..118f96db981 100644 --- a/audio/festival/Makefile +++ b/audio/festival/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2003/10/06 21:40:17 jmc Exp $ +# $NetBSD: Makefile,v 1.28 2003/12/23 10:35:30 sketch Exp $ DISTNAME= festival-1.4.1 PKGREVISION= 1 @@ -29,6 +29,24 @@ FHOME= ${PREFIX}/share/festival .include "../../mk/bsd.prefs.mk" +.if defined(USE_SUNPRO) +PKG_COMPILER?= suncc +.else +PKG_COMPILER!= case "${CC_VERSION}" in \ + gcc-2.6.*) ${ECHO} gcc26;; \ + gcc-2.7.*) ${ECHO} gcc27;; \ + gcc-2.8.*) ${ECHO} gcc28;; \ + gcc-2.95.*) ${ECHO} gcc295;; \ + gcc-3.3.*) ${ECHO} gcc295;; \ + egcs*) ${ECHO} egcs;; \ + *) ${ECHO} ;; \ + esac +.endif + +.if empty(PKG_COMPILER) +PKG_FAIL_REASON= "${CC_VERSION} is not currently supported." +.endif + MAKE_ENV+= PKG_EST_HOME="${SPEECHTOOLS}" \ EST_HOME="${SPEECHTOOLS}" \ PKG_FESTIVAL_BUILD_HOME="${FESTIVAL}" \ @@ -81,12 +99,3 @@ do-install: .include "../../audio/nas/buildlink2.mk" .include "../../mk/bsd.pkg.mk" - -# has to be below bsd.pkg.mk, else ${ECHO} isn't expanded correctly -PKG_COMPILER!= case "`${CC} -v 2>&1`" in *2.6.*) ${ECHO} gcc26;;\ - *2.7.*) ${ECHO} gcc27;;\ - *2.8.*) ${ECHO} gcc28;;\ - *2.95.*) ${ECHO} gcc295;;\ - *3.3.*) ${ECHO} gcc295;;\ - *egcs*) ${ECHO} egcs;;\ - esac -- cgit v1.2.3