[pkgsrc/trunk]: pkgsrc/bootstrap Add bootstrap support for multiarch support ...

[jperkin <jperkin%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3b06a472daa2
branches:  trunk
changeset: 631484:3b06a472daa2
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Fri Mar 07 14:59:42 2014 +0000

description:
Add bootstrap support for multiarch support on Linux.  For now only
building 32-bit packages on x86_64 is supported.

diffstat:

 bootstrap/bootstrap |  12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diffs (42 lines):

diff -r f587503d2b0c -r 3b06a472daa2 bootstrap/bootstrap
--- a/bootstrap/bootstrap       Fri Mar 07 14:52:12 2014 +0000
+++ b/bootstrap/bootstrap       Fri Mar 07 14:59:42 2014 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.201 2014/02/10 10:43:02 ryoon Exp $
+# $NetBSD: bootstrap,v 1.202 2014/03/07 14:59:42 jperkin Exp $
 #
 # Copyright (c) 2001-2011 Alistair Crooks <agc%NetBSD.org@localhost>
 # All rights reserved.
@@ -473,6 +473,7 @@
 bmakexenv=
 bmakexargs=
 need_extras=no
+set_machine_arch=no
 use_bsdinstall=
 case "$opsys" in
 AIX)
@@ -672,6 +673,12 @@
        need_sed=no
        set_opsys=no
        machine_arch=`uname -m | sed -e 's/i.86/i386/'`
+       # Support multiarch systems.
+       if [ "$machine_arch" = "x86_64" -a "$abi" = "32" ]; then
+               machine_arch=i386
+               set_machine_arch=yes
+               bmakexargs="MACHINE_ARCH=$machine_arch"
+       fi
        ;;
 Minix)
        root_group=operator
@@ -934,6 +941,9 @@
 if [ -n "$abi" ]; then
        echo "ABI=                      $abi" >> ${TARGET_MKCONF}
 fi
+if [ "$set_machine_arch" = "yes" ]; then
+       echo "MACHINE_ARCH=             $machine_arch" >> ${TARGET_MKCONF}
+fi
 if [ "$compiler" != "" ]; then
        echo "PKGSRC_COMPILER=  $compiler" >> ${TARGET_MKCONF}
 fi