Fri Jan 11 12:58:30 2008 UTC ()
update devel/cpuflags to 1.18: Remove *any* spaces from CPU_DIR, not just the first


(abs)
diff -r1.120 -r1.121 pkgsrc/devel/cpuflags/Makefile
diff -r1.17 -r1.18 pkgsrc/devel/cpuflags/files/cpuflags.mk
cvs diff -r1.120 -r1.121 pkgsrc/devel/cpuflags/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/cpuflags/Makefile 2007/09/20 10:19:03 1.120
+++ pkgsrc/devel/cpuflags/Makefile 2008/01/11 12:58:30 1.121
@@ -1,21 +1,24 @@ @@ -1,21 +1,24 @@
1# $NetBSD: Makefile,v 1.120 2007/09/20 10:19:03 abs Exp $ 1# $NetBSD: Makefile,v 1.121 2008/01/11 12:58:30 abs Exp $
2 2
3DISTNAME= cpuflags-1.17 3DISTNAME= cpuflags-1.18
4CATEGORIES= sysutils 4CATEGORIES= sysutils
5MASTER_SITES= # empty 5MASTER_SITES= # empty
6DISTFILES= # empty 6DISTFILES= # empty
7 7
8MAINTAINER= abs@NetBSD.org 8MAINTAINER= abs@NetBSD.org
9COMMENT= Determine compiler flags to best target current cpu 9COMMENT= Determine compiler flags to best target current cpu
10 10
11ONLY_FOR_PLATFORM= NetBSD-*-* Linux-*-* SunOS-*-* FreeBSD-*-* 11ONLY_FOR_PLATFORM= NetBSD-*-* Linux-*-* SunOS-*-* FreeBSD-*-*
12 12
13USE_LANGUAGES= # empty 13USE_LANGUAGES= # empty
14NO_CHECKSUM= yes 14NO_CHECKSUM= yes
15NO_CONFIGURE= yes 15NO_CONFIGURE= yes
16 16
17do-extract: 17do-extract:
18 ${MKDIR} ${WRKSRC} 18 ${MKDIR} ${WRKSRC}
19 ${CP} ${FILESDIR}/Makefile ${FILESDIR}/[a-z]* ${WRKSRC} 19 ${CP} ${FILESDIR}/Makefile ${WRKSRC}
 20 ${CP} ${FILESDIR}/c* ${WRKSRC}
 21 ${CP} ${FILESDIR}/o* ${WRKSRC}
 22 ${CP} ${FILESDIR}/s* ${WRKSRC}
20 23
21.include "../../mk/bsd.pkg.mk" 24.include "../../mk/bsd.pkg.mk"
cvs diff -r1.17 -r1.18 pkgsrc/devel/cpuflags/files/cpuflags.mk (expand / switch to unified diff)

--- pkgsrc/devel/cpuflags/files/cpuflags.mk 2006/09/15 14:37:32 1.17
+++ pkgsrc/devel/cpuflags/files/cpuflags.mk 2008/01/11 12:58:30 1.18
@@ -1,37 +1,37 @@ @@ -1,37 +1,37 @@
1# $Id: cpuflags.mk,v 1.17 2006/09/15 14:37:32 abs Exp $ 1# $Id: cpuflags.mk,v 1.18 2008/01/11 12:58:30 abs Exp $
2# Makefile include fragment to simplify use of cpuflags in pkgsrc 2# Makefile include fragment to simplify use of cpuflags in pkgsrc
3# abs@absd.org - freely distributable, no warrenties, stick no bills. 3# abs@absd.org - freely distributable, no warrenties, stick no bills.
4 4
5# Try to optimise based on CPU 5# Try to optimise based on CPU
6# Does not affect any package that overrides CFLAGS/CXXFLAGS/CCOPTIONS 6# Does not affect any package that overrides CFLAGS/CXXFLAGS/CCOPTIONS
7# Sets five variables: 7# Sets five variables:
8# 8#
9# CPU_FLAGS The output of cpuflags 9# CPU_FLAGS The output of cpuflags
10# CFLAGS Has CPU_FLAGS appended 10# CFLAGS Has CPU_FLAGS appended
11# CXXFLAGS Has CPU_FLAGS appended 11# CXXFLAGS Has CPU_FLAGS appended
12# 12#
13# CPU_DIR CPU_FLAGS with spaces stripped (eg: for use in PACKAGES) 13# CPU_DIR CPU_FLAGS with spaces stripped (eg: for use in PACKAGES)
14 14
15.ifndef CPU_FLAGS 15.ifndef CPU_FLAGS
16. if defined(BSD_PKG_MK) || ${USETOOLS:Uyes} == "no" 16. if defined(BSD_PKG_MK) || ${USETOOLS:Uyes} == "no"
17CPU_FLAGS!=@PREFIX@/bin/cpuflags ${CC} 17CPU_FLAGS!=@PREFIX@/bin/cpuflags ${CC}
18. else 18. else
19CPU_FLAGS!=@PREFIX@/bin/cpuflags 19CPU_FLAGS!=@PREFIX@/bin/cpuflags
20. endif 20. endif
21.endif 21.endif
22 22
23.ifndef CPU_DIR 23.ifndef CPU_DIR
24CPU_DIR!=echo ${CPU_FLAGS} | sed 's/ //' 24CPU_DIR!=echo ${CPU_FLAGS} | sed 's/ //g'
25.endif 25.endif
26 26
27.if !defined(MAKEFLAGS) || empty(MAKEFLAGS:MCPU_FLAGS) 27.if !defined(MAKEFLAGS) || empty(MAKEFLAGS:MCPU_FLAGS)
28MAKEFLAGS+=CPU_FLAGS=${CPU_FLAGS:Q} CPU_DIR=${CPU_DIR:Q} # For sub makes 28MAKEFLAGS+=CPU_FLAGS=${CPU_FLAGS:Q} CPU_DIR=${CPU_DIR:Q} # For sub makes
29.endif 29.endif
30 30
31.ifdef BSD_PKG_MK # Try to catch various package opts 31.ifdef BSD_PKG_MK # Try to catch various package opts
32CFLAGS+=${CPU_FLAGS} 32CFLAGS+=${CPU_FLAGS}
33CXXFLAGS+=${CPU_FLAGS} 33CXXFLAGS+=${CPU_FLAGS}
34MAKE_FLAGS+=CCOPTIONS="${CPU_FLAGS}" # Override CCOPTIONS for imake 34MAKE_FLAGS+=CCOPTIONS="${CPU_FLAGS}" # Override CCOPTIONS for imake
35 35
36.elif !defined(IMAGESIZE) && ${DBG} != "-Os" 36.elif !defined(IMAGESIZE) && ${DBG} != "-Os"
37# Assume in base system & not building space optimised distrib, set COPTS 37# Assume in base system & not building space optimised distrib, set COPTS