pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/bootstrap bootstrap: set CONFIG_SHELL when configuring...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/14900dc62cc9
branches:  trunk
changeset: 376243:14900dc62cc9
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Sun Apr 03 20:46:11 2022 +0000

description:
bootstrap: set CONFIG_SHELL when configuring initial libarchive

Otherwise we might end up with defunct libtool.

diffstat:

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

diffs (29 lines):

diff -r 1169f8a87697 -r 14900dc62cc9 bootstrap/bootstrap
--- a/bootstrap/bootstrap       Sun Apr 03 19:36:50 2022 +0000
+++ b/bootstrap/bootstrap       Sun Apr 03 20:46:11 2022 +0000
@@ -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 @@
        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 @@
 
 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 \



Home | Main Index | Thread Index | Old Index