diff options
| author | abs <abs@pkgsrc.org> | 2005-09-23 13:24:17 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2005-09-23 13:24:17 +0000 |
| commit | ba41fe0604c66871dcd2c27a80aae9efe3d007eb (patch) | |
| tree | aece0b0b2ad10c959d1e08039e9fce1094f1948d /devel/cpuflags | |
| parent | 4a175acf600f2e082b5da9749de8e6e6742ddb22 (diff) | |
| download | pkgsrc-ba41fe0604c66871dcd2c27a80aae9efe3d007eb.tar.gz | |
update cpuflags to 0.93 - fix a make-braino in workaround for PKGNAME setting
Diffstat (limited to 'devel/cpuflags')
| -rw-r--r-- | devel/cpuflags/Makefile | 4 | ||||
| -rw-r--r-- | devel/cpuflags/files/optimize_gcc.mk | 13 |
2 files changed, 9 insertions, 8 deletions
diff --git a/devel/cpuflags/Makefile b/devel/cpuflags/Makefile index 37b3a231eb5..f6765bc8f45 100644 --- a/devel/cpuflags/Makefile +++ b/devel/cpuflags/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.95 2005/09/20 10:58:23 abs Exp $ +# $NetBSD: Makefile,v 1.96 2005/09/23 13:24:17 abs Exp $ # -DISTNAME= cpuflags-0.92 +DISTNAME= cpuflags-0.93 CATEGORIES= sysutils MASTER_SITES= # empty DISTFILES= # empty diff --git a/devel/cpuflags/files/optimize_gcc.mk b/devel/cpuflags/files/optimize_gcc.mk index a9adb274b57..56dc74022d0 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.24 2005/09/20 10:58:23 abs Exp $ +# $Id: optimize_gcc.mk,v 1.25 2005/09/23 13:24:17 abs Exp $ # This file is 'experimental' - which is doublespeak for unspeakably # ugly, and quite broken by design. @@ -20,11 +20,6 @@ COPT_FLAGS= # This is a horrible mess, but how else to adjust per package? -TMPPKGNAME=${PKGNAME} -TMPPKGNAME?=${DISTNAME} -PKGBASE?=${TMPPKGNAME:C/-[^-]*$//} -TMPPKGNAME= - COPT_FLAGS+=-ffast-math -fomit-frame-pointer PKG_EXCLUDE_OMIT_FRAME_POINTER+=firefox firefox-gtk1 galeon galeon-devel @@ -36,6 +31,10 @@ 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/-[^-]*$//} + .if !empty(PKG_EXCLUDE_OMIT_FRAME_POINTER:M${PKGBASE}) COPT_FLAGS:= ${COPT_FLAGS:S/-fomit-frame-pointer//} .endif @@ -48,6 +47,8 @@ COPT_FLAGS:= ${COPT_FLAGS:S/-finline-functions//} COPT_FLAGS:= ${COPT_FLAGS:S/-ffast-math//} .endif +TMPPKGNAME= + CFLAGS+=${COPT_FLAGS} CXXFLAGS+=${COPT_FLAGS} MAKE_FLAGS+=CCOPTIONS="${COPT_FLAGS}" # Override CCOPTIONS for imake |