diff options
| author | abs <abs> | 2001-12-03 23:33:01 +0000 |
|---|---|---|
| committer | abs <abs> | 2001-12-03 23:33:01 +0000 |
| commit | 1afd9ce9f9c184bbb09d6ff742089bb4bdd64b5d (patch) | |
| tree | 33cc76230de56c09450ca900b2bcf96e6c9718eb /devel/cpuflags | |
| parent | b5b745d72af70139c77398c69d4925a03727d4f7 (diff) | |
| download | pkgsrc-1afd9ce9f9c184bbb09d6ff742089bb4bdd64b5d.tar.gz | |
Update cpuflags to 0.13 - try to handle cross compiling gracefully.
if $MACHINE is set, and it does not match sysctl hw.machine, return blank
Diffstat (limited to 'devel/cpuflags')
| -rw-r--r-- | devel/cpuflags/Makefile | 4 | ||||
| -rwxr-xr-x | devel/cpuflags/files/cpuflags.NetBSD | 13 |
2 files changed, 11 insertions, 6 deletions
diff --git a/devel/cpuflags/Makefile b/devel/cpuflags/Makefile index dc34354cc8f..e7c875f928e 100644 --- a/devel/cpuflags/Makefile +++ b/devel/cpuflags/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.13 2001/11/27 12:26:11 abs Exp $ +# $NetBSD: Makefile,v 1.14 2001/12/03 23:33:01 abs Exp $ # -DISTNAME= cpuflags-0.12 +DISTNAME= cpuflags-0.13 CATEGORIES= sysutils MASTER_SITES= # empty DISTFILES= # empty diff --git a/devel/cpuflags/files/cpuflags.NetBSD b/devel/cpuflags/files/cpuflags.NetBSD index 7966e789cde..d9588f40088 100755 --- a/devel/cpuflags/files/cpuflags.NetBSD +++ b/devel/cpuflags/files/cpuflags.NetBSD @@ -1,5 +1,5 @@ #!/bin/sh -# $NetBSD: cpuflags.NetBSD,v 1.13 2001/11/27 12:26:12 abs Exp $ +# $NetBSD: cpuflags.NetBSD,v 1.14 2001/12/03 23:33:01 abs Exp $ if [ -x /sbin/sysctl ] ;then SYSCTL=/sbin/sysctl @@ -8,6 +8,13 @@ else fi hw_model=`$SYSCTL -n hw.model` +hw_machine=`$SYSCTL -n hw.machine` + +# We're almost certainly crosscompiling +if [ -n "$MACHINE" -a $hw_machine != "$MACHINE" ]; then + echo + exit +fi case $hw_model in # i386 @@ -30,8 +37,7 @@ case $hw_model in ARM610*) FLAGS="-mcpu=arm610" ;; # risc pc ARM710*) FLAGS="-mcpu=arm710" ;; # risc pc SA-110*) - hw_machine=`$SYSCTL -n hw.machine` # arm32 split post 1.5 - case $hw_machine in + case $hw_machine in # arm32 split post 1.5 cats|dnard|hpcarm|netwinder) FLAGS="-mcpu=strongarm110" ;; acorn32) @@ -50,7 +56,6 @@ case $hw_model in # # vax / unknown *) - hw_machine=`$SYSCTL -n hw.machine` case $hw_machine in vax) ;; # No VAX specific gcc flags :( |