CVS commit: pkgsrc/bootstrap

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Sat May 30 21:36:15 UTC 2020

Modified Files:
        pkgsrc/bootstrap: bootstrap

Log Message:
bootstrap: Fix default target arch on SunOS.

Use the kernel architecture via isainfo -k to base our default on, as uname
will always return the same result regardless.  Ensures we default to 64-bit
pkgsrc on amd64, as well as adding support for sparcv9.


To generate a diff of this commit:
cvs rdiff -u -r1.280 -r1.281 pkgsrc/bootstrap/bootstrap

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/bootstrap/bootstrap
diff -u pkgsrc/bootstrap/bootstrap:1.280 pkgsrc/bootstrap/bootstrap:1.281
--- pkgsrc/bootstrap/bootstrap:1.280    Mon May 25 07:32:59 2020
+++ pkgsrc/bootstrap/bootstrap  Sat May 30 21:36:15 2020
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.280 2020/05/25 07:32:59 jperkin Exp $
+# $NetBSD: bootstrap,v 1.281 2020/05/30 21:36:15 jperkin Exp $
 #
 # Copyright (c) 2001-2011 Alistair Crooks <agc%NetBSD.org@localhost>
 # All rights reserved.
@@ -869,7 +869,7 @@ SunOS)
        idprog="/usr/xpg4/bin/id"
        groupsprog="${idprog} -gn"
        whoamiprog="${idprog} -un"
-       machine_arch=`uname -p | sed -e 's/i86pc/i386/'`
+       machine_arch=`isainfo -k`
        check_compiler=yes
        check_ssp=yes
        ;;
@@ -915,7 +915,9 @@ powerpc/*)  abi=32  machine_arch=powerpc    ;
 powerpc64/32)  abi=32  machine_arch=powerpc    ;;
 powerpc64/*)   abi=64  machine_arch=powerpc64  ;;
 powerpc64le/*) abi=64  machine_arch=powerpc64le;;
-# "sparc" can support 64-bit, e.g. SunOS, defaults to 32-bit.
+# sparc/sparcv9 support 32-bit/64-bit, default to native.
+sparcv9/32)    abi=32  machine_arch=sparc      ;;
+sparcv9/*)     abi=64  machine_arch=sparc64    ;;
 sparc/64)      abi=64  machine_arch=sparc64    ;;
 sparc/*)       abi=32  machine_arch=sparc      ;;
 # x86_64 supports 32-bit/64-bit, defaults to 64-bit.