summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorabs <abs@pkgsrc.org>2005-06-25 10:50:49 +0000
committerabs <abs@pkgsrc.org>2005-06-25 10:50:49 +0000
commit28efc3d9e1d72fac3058b37dc18c7091c5eccb47 (patch)
tree1f6bbf15e453a07ef3c89d3493873c66d27b778d /devel
parent239fdd0d70aa915e5dc9a65e07b169c00fbbaa65 (diff)
downloadpkgsrc-28efc3d9e1d72fac3058b37dc18c7091c5eccb47.tar.gz
Update cpuflags to 0.88
- Add two more x86 entries to cpuflags.Linux - Avoid bogus setting of PKGBASE in optimize_gcc.mk
Diffstat (limited to 'devel')
-rw-r--r--devel/cpuflags/Makefile4
-rwxr-xr-xdevel/cpuflags/files/cpuflags.Linux5
-rw-r--r--devel/cpuflags/files/optimize_gcc.mk11
3 files changed, 8 insertions, 12 deletions
diff --git a/devel/cpuflags/Makefile b/devel/cpuflags/Makefile
index fcfcdaa75b9..52bd41725f6 100644
--- a/devel/cpuflags/Makefile
+++ b/devel/cpuflags/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.90 2005/05/01 22:03:37 abs Exp $
+# $NetBSD: Makefile,v 1.91 2005/06/25 10:50:49 abs Exp $
#
-DISTNAME= cpuflags-0.87
+DISTNAME= cpuflags-0.88
CATEGORIES= sysutils
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/devel/cpuflags/files/cpuflags.Linux b/devel/cpuflags/files/cpuflags.Linux
index e03405b1715..7fbd26e82c3 100755
--- a/devel/cpuflags/files/cpuflags.Linux
+++ b/devel/cpuflags/files/cpuflags.Linux
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: cpuflags.Linux,v 1.16 2005/05/01 22:03:37 abs Exp $
+# $NetBSD: cpuflags.Linux,v 1.17 2005/06/25 10:50:49 abs Exp $
PATH=/sbin:/usr/sbin:/bin:/usr/bin:$PATH
AWK=awk
@@ -31,6 +31,7 @@ case $hw_machine_arch in
"AMD Athlon(tm) XP "*) FLAGS='-march=athlon-xp' ;;
"AMD Duron(TM)") FLAGS='-march=athlon' ;;
"AMD Duron(tm) ") FLAGS='-march=athlon' ;;
+ "Pentium II (Deschutes)") FLAGS='-march=pentium2' ;;
"Celeron (Coppermine)") FLAGS='-march=pentium3' ;;
"Intel(R) Pentium(R) 4 CPU "*) FLAGS='-march=pentium4' ;;
"Intel(R) Pentium(R) III Mobile CPU"*) FLAGS='-march=pentium3m' ;;
@@ -38,7 +39,7 @@ case $hw_machine_arch in
"Mobile Intel(R) Pentium(R) 4 - M "*) FLAGS='-march=pentium4m' ;;
"Pentium III (Coppermine)") FLAGS='-march=pentium3' ;;
"Pentium III (Katmai)") FLAGS='-march=pentium3' ;;
- "Intel(R) Celeron(R) CPU "*)
+ "Intel(R) Celeron(R) CPU "* | "Intel(R) Xeon(TM) CPU "*)
case "$hw_flags" in
*" sse2 "*)
FLAGS='-march=pentium4' ;;
diff --git a/devel/cpuflags/files/optimize_gcc.mk b/devel/cpuflags/files/optimize_gcc.mk
index f1caddfbd6c..f92cc29606d 100644
--- a/devel/cpuflags/files/optimize_gcc.mk
+++ b/devel/cpuflags/files/optimize_gcc.mk
@@ -1,7 +1,7 @@
-# $Id: optimize_gcc.mk,v 1.21 2005/05/01 22:03:37 abs Exp $
+# $Id: optimize_gcc.mk,v 1.22 2005/06/25 10:50:49 abs Exp $
# This file is 'experimental' - which is doublespeak for unspeakably
-# ugly, and probably quite broken by design.
+# ugly, and quite broken by design.
#
# The intention is to pass additional flags to gcc to further optimise
# generated code. It _will_ make it impossible to debug, may fail to
@@ -20,12 +20,7 @@ COPT_FLAGS=
# This is a horrible mess, but how else to adjust per package?
-.if !defined(PKGBASE)
-PKGBASE=${PKGNAME:C/-[^-]*$//}
-.if ${PKGBASE} == ""
-PKGBASE=${.CURDIR:C:.*/::}
-.endif
-.endif
+PKGBASE?=${PKGNAME:C/-[^-]*$//}
COPT_FLAGS+=-ffast-math -fomit-frame-pointer