diff options
| author | tnn <tnn@pkgsrc.org> | 2022-04-03 20:46:11 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2022-04-03 20:46:11 +0000 |
| commit | 4ff5d5a30e10f426181ee4c85a8fc0c02536363e (patch) | |
| tree | a12b4a8f3906119e7b7d8894f9866bae64d43f7d /bootstrap/bootstrap | |
| parent | b389c1de3b0bcaa8f910526e3cb365b538b9858f (diff) | |
| download | pkgsrc-4ff5d5a30e10f426181ee4c85a8fc0c02536363e.tar.gz | |
bootstrap: set CONFIG_SHELL when configuring initial libarchive
Otherwise we might end up with defunct libtool.
Diffstat (limited to 'bootstrap/bootstrap')
| -rwxr-xr-x | bootstrap/bootstrap | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap index c58c4dc7ab1..ca7c5c7f7d0 100755 --- a/bootstrap/bootstrap +++ b/bootstrap/bootstrap @@ -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> # 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 \ |