[pkgsrc/trunk]: pkgsrc/bootstrap Apply parts of a patch from Georg Schwarz to...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9eea801fc531
branches:  trunk
changeset: 504626:9eea801fc531
user:      jschauma <jschauma%pkgsrc.org@localhost>
date:      Sat Dec 17 17:51:40 2005 +0000

description:
Apply parts of a patch from Georg Schwarz to allow IRIX 6.x to bootstrap
again.

diffstat:

 bootstrap/bootstrap |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (35 lines):

diff -r 2a0e38a30b13 -r 9eea801fc531 bootstrap/bootstrap
--- a/bootstrap/bootstrap       Sat Dec 17 17:06:18 2005 +0000
+++ b/bootstrap/bootstrap       Sat Dec 17 17:51:40 2005 +0000
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.46 2005/12/01 03:03:51 minskim Exp $
+# $NetBSD: bootstrap,v 1.47 2005/12/17 17:51:40 jschauma Exp $
 #
 #
 # Copyright (c) 2001-2002 Alistair G. Crooks.  All rights reserved.
@@ -328,12 +328,13 @@
        need_mtree=yes
        need_bsd_install=yes
        need_pax=yes
-       configargs="--with-machine_arch=mipseb"
        get_abi "IRIX"
        opsys=IRIX
        need_sed=yes
        set_opsys=yes
        machine_arch=mipseb
+       bmakexargs="MACHINE_ARCH=$machine_arch"
+       bmakexenv="MAKE=pmake"
        check_compiler=yes
        ;;
 Linux)
@@ -659,7 +660,7 @@
 
 echo_msg "Installing bmake"
 copy_src ../devel/bmake/files bmake
-run_cmd "(cd $wrkdir/bmake && env CPPFLAGS='$CPPFLAGS -I../../libnbcompat' LDFLAGS='$LDFLAGS -L../../libnbcompat' LIBS='-lnbcompat' $shprog ./boot-strap -q -o $opsys --prefix=$prefix 
--sysconfdir=$sysconfdir --mksrc none --with-default-sys-path="$prefix/share/mk")"
+run_cmd "(cd $wrkdir/bmake && env CPPFLAGS='$CPPFLAGS -I../../libnbcompat' LDFLAGS='$LDFLAGS -L../../libnbcompat' LIBS='-lnbcompat' $bmakexenv $shprog ./boot-strap -q -o $opsys --prefix=$prefix 
--sysconfdir=$sysconfdir --mksrc none --with-default-sys-path="$prefix/share/mk" $bmakexargs)"
 run_cmd "$shprog $wrkdir/install-sh -c -o $user -g $group -m 755 $wrkdir/bmake/$opsys/bmake $prefix/bin/bmake"
 #run_cmd "$shprog $wrkdir/install-sh -c -o $user -g $group -m 644 $wrkdir/bmake/$opsys/bmake.1 $prefix/man/man1/bmake.1"