summaryrefslogtreecommitdiff
path: root/devel/cpuflags
diff options
context:
space:
mode:
authorabs <abs>2005-09-27 16:38:11 +0000
committerabs <abs>2005-09-27 16:38:11 +0000
commitba0900321d3f0a45991ed02b6da1a887248e897c (patch)
tree7679b19ef67136ae5f0ff223306bc64541fb9782 /devel/cpuflags
parenta65f8955c6e6e0a1d4f3c385e1eb6e80daceebce (diff)
downloadpkgsrc-ba0900321d3f0a45991ed02b6da1a887248e897c.tar.gz
update cpuflags to 0.94 - do not set PKGBASE in optimize_gcc.mk
Diffstat (limited to 'devel/cpuflags')
-rw-r--r--devel/cpuflags/Makefile4
-rw-r--r--devel/cpuflags/files/optimize_gcc.mk14
2 files changed, 9 insertions, 9 deletions
diff --git a/devel/cpuflags/Makefile b/devel/cpuflags/Makefile
index f6765bc8f45..1c009b1a423 100644
--- a/devel/cpuflags/Makefile
+++ b/devel/cpuflags/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.96 2005/09/23 13:24:17 abs Exp $
+# $NetBSD: Makefile,v 1.97 2005/09/27 16:38:11 abs Exp $
#
-DISTNAME= cpuflags-0.93
+DISTNAME= cpuflags-0.94
CATEGORIES= sysutils
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/devel/cpuflags/files/optimize_gcc.mk b/devel/cpuflags/files/optimize_gcc.mk
index 56dc74022d0..084d5c54f32 100644
--- a/devel/cpuflags/files/optimize_gcc.mk
+++ b/devel/cpuflags/files/optimize_gcc.mk
@@ -1,4 +1,4 @@
-# $Id: optimize_gcc.mk,v 1.25 2005/09/23 13:24:17 abs Exp $
+# $Id: optimize_gcc.mk,v 1.26 2005/09/27 16:38:11 abs Exp $
# This file is 'experimental' - which is doublespeak for unspeakably
# ugly, and quite broken by design.
@@ -31,23 +31,23 @@ PKG_EXCLUDE_FAST_MATH+=firefox firefox-gtk1 # v1.0, NetBSD i386/2.0
PKG_EXCLUDE_OMIT_FRAME_POINTER+=qt3-libs kdeedu3 koffice
.endif
-TMPPKGNAME=${PKGNAME}
-TMPPKGNAME?=${DISTNAME}
-PKGBASE?=${TMPPKGNAME:C/-[^-]*$//}
+TMPPKGNAME:=${PKGNAME:?${PKGNAME}:${DISTNAME}}
+TMPPKGBASE:=${PKGBASE:?${PKGBASE}:${TMPPKGNAME:C/-[^-]*$//}}
-.if !empty(PKG_EXCLUDE_OMIT_FRAME_POINTER:M${PKGBASE})
+.if !empty(PKG_EXCLUDE_OMIT_FRAME_POINTER:M${TMPPKGBASE})
COPT_FLAGS:= ${COPT_FLAGS:S/-fomit-frame-pointer//}
.endif
-.if !empty(PKG_EXCLUDE_INLINE_FUNCTIONS:M${PKGBASE})
+.if !empty(PKG_EXCLUDE_INLINE_FUNCTIONS:M${TMPPKGBASE})
COPT_FLAGS:= ${COPT_FLAGS:S/-finline-functions//}
.endif
-.if !empty(PKG_EXCLUDE_FAST_MATH:M${PKGBASE})
+.if !empty(PKG_EXCLUDE_FAST_MATH:M${TMPPKGBASE})
COPT_FLAGS:= ${COPT_FLAGS:S/-ffast-math//}
.endif
TMPPKGNAME=
+TMPPKGBASE=
CFLAGS+=${COPT_FLAGS}
CXXFLAGS+=${COPT_FLAGS}