diff options
| -rw-r--r-- | devel/cpuflags/Makefile | 4 | ||||
| -rwxr-xr-x | devel/cpuflags/files/cpuflags.NetBSD | 4 | ||||
| -rw-r--r-- | devel/cpuflags/files/cpuflags.mk | 23 |
3 files changed, 12 insertions, 19 deletions
diff --git a/devel/cpuflags/Makefile b/devel/cpuflags/Makefile index ab8b82cd2fb..f06289b2c6b 100644 --- a/devel/cpuflags/Makefile +++ b/devel/cpuflags/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.28 2002/07/17 10:10:39 abs Exp $ +# $NetBSD: Makefile,v 1.29 2002/07/19 09:31:05 abs Exp $ # -DISTNAME= cpuflags-0.28 +DISTNAME= cpuflags-0.29 CATEGORIES= sysutils MASTER_SITES= # empty DISTFILES= # empty diff --git a/devel/cpuflags/files/cpuflags.NetBSD b/devel/cpuflags/files/cpuflags.NetBSD index efb71aa0c36..6964496b7d4 100755 --- a/devel/cpuflags/files/cpuflags.NetBSD +++ b/devel/cpuflags/files/cpuflags.NetBSD @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: cpuflags.NetBSD,v 1.23 2002/07/17 10:10:40 abs Exp $ +# $NetBSD: cpuflags.NetBSD,v 1.24 2002/07/19 09:31:05 abs Exp $ if [ -x /sbin/sysctl ] ;then SYSCTL=/sbin/sysctl @@ -22,7 +22,7 @@ case $hw_machine_arch in alpha) # cpu0 at mainbus0: ID 0 (primary), 21164A-0 (unknown ... case "`egrep '^cpu0 ' /var/run/dmesg.boot`" in - *\ 21164A\ *) FLAGS="-mcpu=21164a" ;; + *\ 21164A[-\ ]*) FLAGS="-mcpu=21164a" ;; *\ 21066\ *) FLAGS="-mcpu=21064" ;; esac ;; diff --git a/devel/cpuflags/files/cpuflags.mk b/devel/cpuflags/files/cpuflags.mk index 3c6f537f018..706f4923747 100644 --- a/devel/cpuflags/files/cpuflags.mk +++ b/devel/cpuflags/files/cpuflags.mk @@ -1,4 +1,4 @@ -# $Id: cpuflags.mk,v 1.5 2002/07/16 10:42:45 abs Exp $ +# $Id: cpuflags.mk,v 1.6 2002/07/19 09:31:05 abs Exp $ # Makefile include fragment to simplify use of cpuflags in pkgsrc # abs@netbsd.org - freely distributable, no warrenties, stick no bills. @@ -14,25 +14,18 @@ .ifndef CPU_FLAGS -xCPU_FLAGS!=/usr/pkg/bin/cpuflags -xCPU_DIR!=echo ${CPU_FLAGS} | sed 's/ //' -# Make the flags available to sub makes -.MAKEFLAGS+=CPU_FLAGS="${xCPU_FLAGS}" CPU_DIR="${xCPU_DIR}" -CPU_FLAGS=${xCPU_FLAGS} -CPU_DIR=${xCPU_DIR} -.endif +CPU_FLAGS!=/usr/pkg/bin/cpuflags +CPU_DIR!=echo ${CPU_FLAGS} | sed 's/ //' +MAKEFLAGS+=CPU_FLAGS=${CPU_FLAGS} CPU_DIR="${CPU_DIR}" # For sub makes -.ifdef BSD_PKG_MK +.endif -# Try to catch the various package mechanisms +.ifdef BSD_PKG_MK # Try to catch various package opts CFLAGS+=${CPU_FLAGS} CXXFLAGS+=${CPU_FLAGS} -# Override CCOPTIONS for imake -MAKE_FLAGS+=CCOPTIONS="${CPU_FLAGS}" - -.else +MAKE_FLAGS+=CCOPTIONS="${CPU_FLAGS}" # Override CCOPTIONS for imake -# Assume we are in the standard build system, only touch COPTS +.else # Assume in base system, only COPTS COPTS+=${CPU_FLAGS} .endif |