diff options
| author | jschauma <jschauma> | 2005-12-17 17:51:40 +0000 |
|---|---|---|
| committer | jschauma <jschauma> | 2005-12-17 17:51:40 +0000 |
| commit | 6f3b4fd88531de120fdf65ebc63f55fd11ba295f (patch) | |
| tree | 8ef752b1803c903a04d96283e86d943dff41ae20 /bootstrap | |
| parent | 56366c0c2fc7c701482b7d7f0060af85d2ae5991 (diff) | |
| download | pkgsrc-6f3b4fd88531de120fdf65ebc63f55fd11ba295f.tar.gz | |
Apply parts of a patch from Georg Schwarz to allow IRIX 6.x to bootstrap
again.
Diffstat (limited to 'bootstrap')
| -rwxr-xr-x | bootstrap/bootstrap | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap index ca73f6e31d4..c11bf730c3c 100755 --- a/bootstrap/bootstrap +++ b/bootstrap/bootstrap @@ -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 @@ IRIX*) 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 @@ fi 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" |