CVS commit: pkgsrc/bootstrap

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sun Apr  3 20:46:12 UTC 2022

Modified Files:
        pkgsrc/bootstrap: bootstrap

Log Message:
bootstrap: set CONFIG_SHELL when configuring initial libarchive

Otherwise we might end up with defunct libtool.


To generate a diff of this commit:
cvs rdiff -u -r1.308 -r1.309 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.308 pkgsrc/bootstrap/bootstrap:1.309
--- pkgsrc/bootstrap/bootstrap:1.308    Sun Apr  3 19:20:59 2022
+++ pkgsrc/bootstrap/bootstrap  Sun Apr  3 20:46:11 2022
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.308 2022/04/03 19:20:59 tnn Exp $
+# $NetBSD: bootstrap,v 1.309 2022/04/03 20:46:11 tnn Exp $
 #
 # Copyright (c) 2001-2011 Alistair Crooks <agc%NetBSD.org@localhost>
 # All rights reserved.
@@ -779,7 +779,7 @@ OSF1)
        need_awk=yes
        need_sed=yes
        need_mksh=yes
-       shprog=/usr/bin/ksh
+       shprog=/bin/ksh
        machine_arch=`uname -p`
        ;;
 QNX)
@@ -1301,7 +1301,7 @@ extra_libarchive_depends() {
 
 echo_msg "Bootstrapping pkgtools"
 copy_src $pkgsrcdir/archivers/libarchive/files libarchive
-run_cmd "(cd $wrkdir/libarchive; env $BSTRAP_ENV \
+run_cmd "(cd $wrkdir/libarchive; env $BSTRAP_ENV CONFIG_SHELL=$shprog \
 $shprog ./configure $configure_quiet_flags --enable-static --disable-shared \
 --disable-bsdtar --disable-bsdcpio --disable-posix-regex-lib --disable-xattr \
 --disable-maintainer-mode --disable-acl --without-zlib --without-bz2lib \