pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/doc Update devel/cpuflags to 1.02
details: https://anonhg.NetBSD.org/pkgsrc/rev/eec416b25ad3
branches: trunk
changeset: 518638:eec416b25ad3
user: abs <abs%pkgsrc.org@localhost>
date: Fri Sep 15 14:37:32 2006 +0000
description:
Update devel/cpuflags to 1.02
- Linux uses both 'AMD Athlon(TM) XP' and 'AMD Athlon(tm) XP'
- Add at least Opteron recognition to solaris via 'psrinfo -pv'
- Cleanup trailing whitespace
diffstat:
devel/cpuflags/Makefile | 4 ++--
devel/cpuflags/files/cpuflags.Linux | 5 +++--
devel/cpuflags/files/cpuflags.NetBSD | 20 ++++++++++----------
devel/cpuflags/files/cpuflags.SunOS | 13 ++++++++++---
devel/cpuflags/files/cpuflags.mk | 6 +++---
doc/CHANGES-2006 | 3 ++-
6 files changed, 30 insertions(+), 21 deletions(-)
diffs (179 lines):
diff -r ac9ed5c6878e -r eec416b25ad3 devel/cpuflags/Makefile
--- a/devel/cpuflags/Makefile Fri Sep 15 14:18:41 2006 +0000
+++ b/devel/cpuflags/Makefile Fri Sep 15 14:37:32 2006 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.104 2006/06/21 11:15:14 abs Exp $
+# $NetBSD: Makefile,v 1.105 2006/09/15 14:37:32 abs Exp $
#
-DISTNAME= cpuflags-1.01
+DISTNAME= cpuflags-1.02
CATEGORIES= sysutils
MASTER_SITES= # empty
DISTFILES= # empty
diff -r ac9ed5c6878e -r eec416b25ad3 devel/cpuflags/files/cpuflags.Linux
--- a/devel/cpuflags/files/cpuflags.Linux Fri Sep 15 14:18:41 2006 +0000
+++ b/devel/cpuflags/files/cpuflags.Linux Fri Sep 15 14:37:32 2006 +0000
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: cpuflags.Linux,v 1.19 2005/11/06 15:31:20 abs Exp $
+# $NetBSD: cpuflags.Linux,v 1.20 2006/09/15 14:37:32 abs Exp $
PATH=/sbin:/usr/sbin:/bin:/usr/bin:$PATH
AWK=awk
@@ -28,6 +28,7 @@
i386) FLAGS='-march=i386' ;;
i486) FLAGS='-march=i486' ;;
i686) case $hw_model in
+ "AMD Athlon(TM) XP "*) FLAGS='-march=athlon-xp' ;;
"AMD Athlon(tm) XP "*) FLAGS='-march=athlon-xp' ;;
"AMD Duron(TM)") FLAGS='-march=athlon' ;;
"AMD Duron(tm) ") FLAGS='-march=athlon' ;;
@@ -44,7 +45,7 @@
case "$hw_flags" in
*" sse2 "*)
FLAGS='-march=pentium4' ;;
- esac
+ esac
esac ;;
diff -r ac9ed5c6878e -r eec416b25ad3 devel/cpuflags/files/cpuflags.NetBSD
--- a/devel/cpuflags/files/cpuflags.NetBSD Fri Sep 15 14:18:41 2006 +0000
+++ b/devel/cpuflags/files/cpuflags.NetBSD Fri Sep 15 14:37:32 2006 +0000
@@ -1,16 +1,16 @@
#!/bin/sh
-# $NetBSD: cpuflags.NetBSD,v 1.65 2006/06/21 11:15:14 abs Exp $
+# $NetBSD: cpuflags.NetBSD,v 1.66 2006/09/15 14:37:32 abs Exp $
PATH=/sbin:/usr/sbin:/bin:/usr/bin:$PATH
AWK=awk
display_hw_details()
{
- echo " OS : '$(uname)'"
- echo " hw.model : '$hw_model'"
- echo " hw.machine : '$hw_machine'"
+ echo " OS : '$(uname)'"
+ echo " hw.model : '$hw_model'"
+ echo " hw.machine : '$hw_machine'"
echo " hw.machine_arch : '$hw_machine_arch'"
- echo " cpu details :"
+ echo " cpu details :"
sed -n -e 's/^/ /' -e '/^ cpu/p' /var/run/dmesg.boot
}
@@ -84,7 +84,7 @@
*AMD\ K7\ \(Athlon\)\ XP\ *) FLAGS='-march=athlon-xp' ;;
*AMD\ Athlon\ XP\ *) FLAGS='-march=athlon-xp' ;;
*AMD\ K7*|*AMD\ Athlon*) FLAGS='-march=athlon' ;;
- *AMD\ Unknown\ K7\ \(Athlon\)*) FLAGS='-march=athlon' ;;
+ *AMD\ Unknown\ K7\ \(Athlon\)*) FLAGS='-march=athlon' ;;
*386-class*) FLAGS='-march=i386' ;;
*486-class*) FLAGS='-march=i486' ;;
*586-class*) FLAGS='-march=pentium' ;;
@@ -99,8 +99,8 @@
*\(68060*|*\ MC68060\ *) FLAGS='-m68060' ;; # Upgr amiga 3000
esac
case "$(egrep '^fpu0 ' /var/run/dmesg.boot)" in
- *\(emulator\)*) FLAGS="$FLAGS -msoft-float" ;;
- *\(no\ math\ support\)*) FLAGS="$FLAGS -msoft-float" ;;
+ *\(emulator\)*) FLAGS="$FLAGS -msoft-float" ;;
+ *\(no\ math\ support\)*) FLAGS="$FLAGS -msoft-float" ;;
esac
;;
@@ -113,7 +113,7 @@
*\ MIPS\ R2000\ *) FLAGS="-march=r2000" ;;
*\ MIPS\ R3000\ *) FLAGS="-march=r3000" ;;
*\ MIPS\ R3000A\ *) FLAGS="-march=r3000" ;;
- *\ Toshiba\ TX3912\ *) FLAGS="-march=r3900" ;;
+ *\ Toshiba\ TX3912\ *) FLAGS="-march=r3900" ;;
*\ Toshiba\ TX392[27]\ *) FLAGS="-march=r3900" ;;
*\ MIPS\ R4000\ *) FLAGS="-mtune=r4000 -mips2" ;; # mips3
*\ MIPS\ R4400\ *) FLAGS="-mtune=r4400 -mips2" ;; # mips3
@@ -140,7 +140,7 @@
7400\ *) FLAGS='-mcpu=7400' ;; # AGP G4/400 Mac
740\ *) FLAGS='-mcpu=740' ;; # Untested
7410\ *) FLAGS='-mcpu=7400' ;; # powerbook g4
- 7447A\ *) FLAGS='-mcpu=7450' ;; #
+ 7447A\ *) FLAGS='-mcpu=7450' ;; #
7450\ *) FLAGS='-mcpu=7450' ;; # tibook 550
750\ *) FLAGS='-mcpu=750' ;; # Untested
diff -r ac9ed5c6878e -r eec416b25ad3 devel/cpuflags/files/cpuflags.SunOS
--- a/devel/cpuflags/files/cpuflags.SunOS Fri Sep 15 14:18:41 2006 +0000
+++ b/devel/cpuflags/files/cpuflags.SunOS Fri Sep 15 14:37:32 2006 +0000
@@ -1,21 +1,28 @@
#!/bin/sh
-# $NetBSD: cpuflags.SunOS,v 1.8 2005/07/22 12:13:12 abs Exp $
+# $NetBSD: cpuflags.SunOS,v 1.9 2006/09/15 14:37:32 abs Exp $
PATH=/sbin:/usr/sbin:/bin:/usr/bin:$PATH
AWK=nawk
display_hw_details()
{
- echo " OS : '`uname`'"
- echo " arch : '$hw_arch'"
+ echo " OS : '`uname`'"
+ echo " arch : '$hw_arch'"
+ echo " psrinfo : '$hw_psrinfo'"
}
hw_arch=`/usr/bin/uname -m`
+hw_psrinfo=`psrinfo -pv | $AWK 'NR==3{print}'` # Just gets the first CPU
case $hw_arch in
sun4c | sun4 ) FLAGS='-mcpu=cypress' ;;
sun4m ) FLAGS='-mcpu=supersparc' ;;
sun4u ) FLAGS='-mcpu=v9' ;;
+ i86pc )
+ case "$hw_psrinfo" in
+ *AMD\ Opteron\(tm\)*) FLAGS="-mcpu=opteron" ;;
+ esac
+ ;;
esac
############
diff -r ac9ed5c6878e -r eec416b25ad3 devel/cpuflags/files/cpuflags.mk
--- a/devel/cpuflags/files/cpuflags.mk Fri Sep 15 14:18:41 2006 +0000
+++ b/devel/cpuflags/files/cpuflags.mk Fri Sep 15 14:37:32 2006 +0000
@@ -1,4 +1,4 @@
-# $Id: cpuflags.mk,v 1.16 2005/05/01 22:03:37 abs Exp $
+# $Id: cpuflags.mk,v 1.17 2006/09/15 14:37:32 abs Exp $
# Makefile include fragment to simplify use of cpuflags in pkgsrc
# abs%absd.org@localhost - freely distributable, no warrenties, stick no bills.
@@ -12,7 +12,7 @@
#
# CPU_DIR CPU_FLAGS with spaces stripped (eg: for use in PACKAGES)
-.ifndef CPU_FLAGS
+.ifndef CPU_FLAGS
. if defined(BSD_PKG_MK) || ${USETOOLS:Uyes} == "no"
CPU_FLAGS!=@PREFIX@/bin/cpuflags ${CC}
. else
@@ -25,7 +25,7 @@
.endif
.if !defined(MAKEFLAGS) || empty(MAKEFLAGS:MCPU_FLAGS)
-MAKEFLAGS+=CPU_FLAGS=${CPU_FLAGS:Q} CPU_DIR=${CPU_DIR:Q} # For sub makes
+MAKEFLAGS+=CPU_FLAGS=${CPU_FLAGS:Q} CPU_DIR=${CPU_DIR:Q} # For sub makes
.endif
.ifdef BSD_PKG_MK # Try to catch various package opts
diff -r ac9ed5c6878e -r eec416b25ad3 doc/CHANGES-2006
--- a/doc/CHANGES-2006 Fri Sep 15 14:18:41 2006 +0000
+++ b/doc/CHANGES-2006 Fri Sep 15 14:37:32 2006 +0000
@@ -1,4 +1,4 @@
->$NetBSD: CHANGES-2006,v 1.1288 2006/09/15 13:56:54 ghen Exp $
+>$NetBSD: CHANGES-2006,v 1.1289 2006/09/15 14:38:01 abs Exp $
Changes to the packages collection and infrastructure in 2006:
@@ -4321,3 +4321,4 @@
Updated www/firefox-gtk1 to 1.5.0.7 [ghen 2006-09-15]
Updated mail/thunderbird to 1.5.0.7 [ghen 2006-09-15]
Updated mail/thunderbird-gtk1 to 1.5.0.7 [ghen 2006-09-15]
+ Updated devel/cpuflags to 1.02 [abs 2006-09-15]
Home |
Main Index |
Thread Index |
Old Index