diff options
| author | abs <abs> | 2004-01-20 23:38:46 +0000 |
|---|---|---|
| committer | abs <abs> | 2004-01-20 23:38:46 +0000 |
| commit | 7972389e7dd15b6331693117673071b5a44ab4f7 (patch) | |
| tree | ad0604ebcf318331f5b38b36a90bcc0d1bc59ce7 /devel | |
| parent | ad33444dd98501d931e220261beeb3fbaf44fde2 (diff) | |
| download | pkgsrc-7972389e7dd15b6331693117673071b5a44ab4f7.tar.gz | |
Update cpuflags to 0.60:
Set CPU_DIR and MAKE_ENV even if CPU_FLAGS is already set.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/cpuflags/Makefile | 4 | ||||
| -rw-r--r-- | devel/cpuflags/files/cpuflags.mk | 15 |
2 files changed, 11 insertions, 8 deletions
diff --git a/devel/cpuflags/Makefile b/devel/cpuflags/Makefile index fffa3027cdc..49c6e3f863b 100644 --- a/devel/cpuflags/Makefile +++ b/devel/cpuflags/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.62 2003/12/04 10:13:26 abs Exp $ +# $NetBSD: Makefile,v 1.63 2004/01/20 23:38:46 abs Exp $ # -DISTNAME= cpuflags-0.59 +DISTNAME= cpuflags-0.60 CATEGORIES= sysutils MASTER_SITES= # empty DISTFILES= # empty diff --git a/devel/cpuflags/files/cpuflags.mk b/devel/cpuflags/files/cpuflags.mk index 0172cce022d..315d9983d61 100644 --- a/devel/cpuflags/files/cpuflags.mk +++ b/devel/cpuflags/files/cpuflags.mk @@ -1,4 +1,4 @@ -# $Id: cpuflags.mk,v 1.11 2003/10/02 16:10:00 abs Exp $ +# $Id: cpuflags.mk,v 1.12 2004/01/20 23:38:46 abs Exp $ # Makefile include fragment to simplify use of cpuflags in pkgsrc # abs@netbsd.org - freely distributable, no warrenties, stick no bills. @@ -12,17 +12,20 @@ # # CPU_DIR CPU_FLAGS with spaces stripped (eg: for use in PACKAGES) -.ifndef CPU_FLAGS - -.if defined(BSD_PKG_MK) || ${USETOOLS:Uyes} == "no" +.ifndef CPU_FLAGS +. if defined(BSD_PKG_MK) || ${USETOOLS:Uyes} == "no" CPU_FLAGS!=/usr/pkg/bin/cpuflags ${CC} -.else +. else CPU_FLAGS!=/usr/pkg/bin/cpuflags +. endif .endif +.ifndef CPU_DIR CPU_DIR!=echo ${CPU_FLAGS} | sed 's/ //' -MAKEFLAGS+=CPU_FLAGS=${CPU_FLAGS} CPU_DIR="${CPU_DIR}" # For sub makes +.endif +.if empty(MAKEFLAGS:MCPU_FLAGS=) +MAKEFLAGS+=CPU_FLAGS=${CPU_FLAGS} CPU_DIR="${CPU_DIR}" # For sub makes .endif .ifdef BSD_PKG_MK # Try to catch various package opts |