diff options
| author | abs <abs> | 2002-06-27 20:49:02 +0000 |
|---|---|---|
| committer | abs <abs> | 2002-06-27 20:49:02 +0000 |
| commit | 7135e9a7c0bdad1a2a9e95ae37da02030b1c0da4 (patch) | |
| tree | aec1eb366694bd68e7d23d455bc1122b822f4645 /devel | |
| parent | 9f14494a9bd9f6433894de2140bdd6a4b9b5624f (diff) | |
| download | pkgsrc-7135e9a7c0bdad1a2a9e95ae37da02030b1c0da4.tar.gz | |
Updated cpuflags to 0.24
If BSD_PKG_MK is not defined, only touch COPTS, not CFLAGS etc.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/cpuflags/Makefile | 4 | ||||
| -rw-r--r-- | devel/cpuflags/files/cpuflags.mk | 23 |
2 files changed, 19 insertions, 8 deletions
diff --git a/devel/cpuflags/Makefile b/devel/cpuflags/Makefile index fb510d746f6..40ef56aba79 100644 --- a/devel/cpuflags/Makefile +++ b/devel/cpuflags/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.23 2002/06/21 11:35:16 abs Exp $ +# $NetBSD: Makefile,v 1.24 2002/06/27 20:49:02 abs Exp $ # -DISTNAME= cpuflags-0.23 +DISTNAME= cpuflags-0.24 CATEGORIES= sysutils MASTER_SITES= # empty DISTFILES= # empty diff --git a/devel/cpuflags/files/cpuflags.mk b/devel/cpuflags/files/cpuflags.mk index 2b3aaa37b98..e01269ae74d 100644 --- a/devel/cpuflags/files/cpuflags.mk +++ b/devel/cpuflags/files/cpuflags.mk @@ -1,4 +1,4 @@ -# $Id: cpuflags.mk,v 1.3 2002/01/03 11:54:47 abs Exp $ +# $Id: cpuflags.mk,v 1.4 2002/06/27 20:49:02 abs Exp $ # Makefile include fragment to simplify use of cpuflags in pkgsrc # abs@netbsd.org - freely distributable, no warrenties, stick no bills. @@ -14,16 +14,27 @@ # LOWER_CPU_DIR As CPU_FLAGS but all lower case -.if ! defined(CPU_FLAGS) +.ifndef CPU_FLAGS + CPU_FLAGS!=/usr/pkg/bin/cpuflags CPU_DIR!=echo ${CPU_FLAGS} | sed 's/ //' LOWER_CPU_DIR!=echo ${CPU_DIR} | tr A-Z a-z -CFLAGS+=${CPU_FLAGS} -CXXFLAGS+=${CPU_FLAGS} - # Make the flags available to make -MAKE_ENV+=CPU_FLAGS=${CPU_FLAGS} CPU_DIR=${CPU_DIR} +MAKE_ENV+=CPU_FLAGS=${CPU_FLAGS} CPU_DIR=${CPU_DIR} LOWER_CPU_DIR=${LOWER_CPU_DIR} + +.endif +.ifdef BSD_PKG_MK + +# Try to catch the varuous package mechanisms +CFLAGS+=${CPU_FLAGS} +CXXFLAGS+=${CPU_FLAGS} # Override CCOPTIONS for imake MAKE_FLAGS+=CCOPTIONS=${CPU_FLAGS} + +.else + +# Assume we are in the standard build system, only touch COPTS +COPTS+=${CPU_FLAGS} + .endif |