[pkgsrc/trunk]: pkgsrc/mk/bulk get and use the value of ${MACHINE_ARCH} inste...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6900acfa2428
branches:  trunk
changeset: 466528:6900acfa2428
user:      grant <grant%pkgsrc.org@localhost>
date:      Tue Jan 20 07:01:18 2004 +0000

description:
get and use the value of ${MACHINE_ARCH} instead of `uname -p` to
correctly reflect the pkgsrc arch.

(uname -p returns "unknown" on (my) Linux, which is not very helpful..)

diffstat:

 mk/bulk/build |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r 093aa4821d23 -r 6900acfa2428 mk/bulk/build
--- a/mk/bulk/build     Tue Jan 20 06:49:21 2004 +0000
+++ b/mk/bulk/build     Tue Jan 20 07:01:18 2004 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $NetBSD: build,v 1.30 2004/01/17 09:38:18 grant Exp $
+# $NetBSD: build,v 1.31 2004/01/20 07:01:18 grant Exp $
 
 #
 # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf%netbsd.org@localhost>
@@ -115,6 +115,7 @@
        GREP=`${BMAKE} show-var VARNAME=GREP` || fail=yes
        SED=`${BMAKE} show-var VARNAME=SED` || fail=yes
        MAIL=`${BMAKE} show-var VARNAME=MAIL` || fail=yes
+       MACHINE_ARCH=`${BMAKE} show-var VARNAME=MACHINE_ARCH` || fail=yes
 else
        echo "The pkgtools/pkglint directory does not exist.  Please update"
        echo "your pkgsrc tree in ${USR_PKGSRC}"
@@ -206,7 +207,7 @@
        if [ $? -ne 0 ]; then
                built=`wc -l $BUILDLOG | ${AWK} '{print $1}'`
                percent=`echo $built $tot | ${AWK} '{printf("%4.1f%%",$1*100/$2);}'`
-               (cd $pkgdir && nice -n 20 ${BMAKE} USE_BULK_CACHE=yes bulk-package </dev/null | ${SED} "s;^;`date '+%m/%d/%y %H:%M:%S'`  $built/${tot}=$percent $pkgdir @ `uname -p`> ;g")
+               (cd $pkgdir && nice -n 20 ${BMAKE} USE_BULK_CACHE=yes bulk-package </dev/null | ${SED} "s;^;`date '+%m/%d/%y %H:%M:%S'`  $built/${tot}=$percent $pkgdir @ ${MACHINE_ARCH}> ;g")
                echo "$pkgdir" >> $BUILDLOG
        fi
 done