pkg/45363: bootstrap must use x86_64 as machine_arch on Solaris 10 amd64

[KOT%MATPOCKuH.Ru@localhost]

>Number:         45363
>Category:       pkg
>Synopsis:       bootstrap must use x86_64 as machine_arch on Solaris 10 amd64
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Tue Sep 13 14:35:00 +0000 2011
>Originator:     Dmitry Afanasiev
>Release:        
>Organization:
>Environment:
SunOS sunray 5.10 Generic_144489-01 i86pc i386 i86pc
>Description:
On Solaris 10 amd64 uname -p returns i386.
When bootstrap-ing with ABI=64 MACHINE_ARCH must be equal x86_64.
But in bootstrap/bootstrap I see:
        machine_arch=`uname -p | sed -e 's/i86pc/i386/'`

It must be changed to:
[ "_$abi" = "_64" ] &&
  machine_arch=`uname -p | sed -e 's/i386/x86_64/'` ||
  machine_arch=`uname -p`

>How-To-Repeat:

>Fix: