CVS commit: pkgsrc/bootstrap

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Wed May  6 15:34:31 UTC 2020

Modified Files:
        pkgsrc/bootstrap: bootstrap

Log Message:
bootstrap: Use SH for bmake if specified.

Fixes issue seen bootstrapping on Solaris 9 when bash is available and being
used for SH, bmake was still defaulting to /usr/xpg4/bin/sh which dumps core
with some of the mk/check infrastructure.

Note this is only for the bmake used during the initial bootstrap, the final
bmake package will still use the defshell logic in its Makefile.


To generate a diff of this commit:
cvs rdiff -u -r1.278 -r1.279 pkgsrc/bootstrap/bootstrap

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/bootstrap/bootstrap
diff -u pkgsrc/bootstrap/bootstrap:1.278 pkgsrc/bootstrap/bootstrap:1.279
--- pkgsrc/bootstrap/bootstrap:1.278    Wed Apr 29 20:27:03 2020
+++ pkgsrc/bootstrap/bootstrap  Wed May  6 15:34:31 2020
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.278 2020/04/29 20:27:03 triaxx Exp $
+# $NetBSD: bootstrap,v 1.279 2020/05/06 15:34:31 jperkin Exp $
 #
 # Copyright (c) 2001-2011 Alistair Crooks <agc%NetBSD.org@localhost>
 # All rights reserved.
@@ -1213,6 +1213,10 @@ run_cmd "(cd ${pkgsrcdir}/pkgtools/boots
 ROOT_USER=${root_user} SED=${sedprog} SYSCONFDIR=${sysconfdir} \
 $shprog ./bootstrap.sh)"
 
+if [ -n "${bootstrap_sh_set}" ]; then
+       bmakexargs="${bmakexargs} --with-defshell=${bootstrap_sh}"
+fi
+
 bootstrap_bmake() {
        echo_msg "Bootstrapping bmake"
        copy_src $pkgsrcdir/devel/bmake/files bmake