Mon Dec 27 14:16:30 2021 UTC ()
extra_libarchive_depends() apparently hasn't given multiple values for
Libs.private before, but it does on Gentoo ("-lmd -lb2"), so failing to
double-quote the output breaks bootstrap there. Adding the quotes causes
no regressions bootstrapping macOS Monterey or Ubuntu 21.10. Problem
report and solution from p.spek@tyil.nl.


(schmonz)
diff -r1.304 -r1.305 pkgsrc/bootstrap/bootstrap
cvs diff -r1.304 -r1.305 pkgsrc/bootstrap/bootstrap (expand / switch to unified diff)

--- pkgsrc/bootstrap/bootstrap 2021/11/29 18:32:51 1.304
+++ pkgsrc/bootstrap/bootstrap 2021/12/27 14:16:30 1.305
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1#! /bin/sh 1#! /bin/sh
2 2
3# $NetBSD: bootstrap,v 1.304 2021/11/29 18:32:51 jperkin Exp $ 3# $NetBSD: bootstrap,v 1.305 2021/12/27 14:16:30 schmonz Exp $
4# 4#
5# Copyright (c) 2001-2011 Alistair Crooks <agc@NetBSD.org> 5# Copyright (c) 2001-2011 Alistair Crooks <agc@NetBSD.org>
6# All rights reserved. 6# All rights reserved.
7# 7#
8# Redistribution and use in source and binary forms, with or without 8# Redistribution and use in source and binary forms, with or without
9# modification, are permitted provided that the following conditions 9# modification, are permitted provided that the following conditions
10# are met: 10# are met:
11# 1. Redistributions of source code must retain the above copyright 11# 1. Redistributions of source code must retain the above copyright
12# notice, this list of conditions and the following disclaimer. 12# notice, this list of conditions and the following disclaimer.
13# 2. Redistributions in binary form must reproduce the above copyright 13# 2. Redistributions in binary form must reproduce the above copyright
14# notice, this list of conditions and the following disclaimer in the 14# notice, this list of conditions and the following disclaimer in the
15# documentation and/or other materials provided with the distribution. 15# documentation and/or other materials provided with the distribution.
16# 16#
@@ -1294,27 +1294,27 @@ $shprog ./configure $configure_quiet_fla @@ -1294,27 +1294,27 @@ $shprog ./configure $configure_quiet_fla
1294--disable-maintainer-mode --disable-acl --without-zlib --without-bz2lib \ 1294--disable-maintainer-mode --disable-acl --without-zlib --without-bz2lib \
1295--without-iconv --without-lzma --without-lzo2 --without-lz4 \ 1295--without-iconv --without-lzma --without-lzo2 --without-lz4 \
1296--without-nettle --without-openssl --without-xml2 --without-expat --without-zstd \ 1296--without-nettle --without-openssl --without-xml2 --without-expat --without-zstd \
1297MAKE=$bmake && $bmake $make_quiet_flags -j$make_jobs)" 1297MAKE=$bmake && $bmake $make_quiet_flags -j$make_jobs)"
1298copy_src $pkgsrcdir/pkgtools/pkg_install/files pkg_install 1298copy_src $pkgsrcdir/pkgtools/pkg_install/files pkg_install
1299run_cmd "(cd $wrkdir/pkg_install; env $BSTRAP_ENV \ 1299run_cmd "(cd $wrkdir/pkg_install; env $BSTRAP_ENV \
1300CPPFLAGS='$CPPFLAGS -I${wrkdir}/libnbcompat -I${wrkdir}/libarchive/libarchive' \ 1300CPPFLAGS='$CPPFLAGS -I${wrkdir}/libnbcompat -I${wrkdir}/libarchive/libarchive' \
1301LDFLAGS='$LDFLAGS -L${wrkdir}/libnbcompat' \ 1301LDFLAGS='$LDFLAGS -L${wrkdir}/libnbcompat' \
1302LIBS='$LIBS -lnbcompat' $shprog ./configure $configure_quiet_flags -C \ 1302LIBS='$LIBS -lnbcompat' $shprog ./configure $configure_quiet_flags -C \
1303--enable-bootstrap --prefix=$prefix --sysconfdir=$sysconfdir \ 1303--enable-bootstrap --prefix=$prefix --sysconfdir=$sysconfdir \
1304--with-pkgdbdir=$pkgdbdir --infodir=$infodir \ 1304--with-pkgdbdir=$pkgdbdir --infodir=$infodir \
1305--mandir=$mandir $pkg_install_args && \ 1305--mandir=$mandir $pkg_install_args && \
1306STATIC_LIBARCHIVE=$wrkdir/libarchive/.libs/libarchive.a \ 1306STATIC_LIBARCHIVE=$wrkdir/libarchive/.libs/libarchive.a \
1307STATIC_LIBARCHIVE_LDADD=`extra_libarchive_depends` \ 1307STATIC_LIBARCHIVE_LDADD="`extra_libarchive_depends`" \
1308PKGSRC_MACHINE_ARCH="$machine_arch" $bmake $make_quiet_flags -j$make_jobs)" 1308PKGSRC_MACHINE_ARCH="$machine_arch" $bmake $make_quiet_flags -j$make_jobs)"
1309run_cmd "$install_sh -c -o $user -g $group -m 755 $wrkdir/pkg_install/add/pkg_add $wrkdir/sbin/pkg_add" 1309run_cmd "$install_sh -c -o $user -g $group -m 755 $wrkdir/pkg_install/add/pkg_add $wrkdir/sbin/pkg_add"
1310run_cmd "$install_sh -c -o $user -g $group -m 755 $wrkdir/pkg_install/admin/pkg_admin $wrkdir/sbin/pkg_admin" 1310run_cmd "$install_sh -c -o $user -g $group -m 755 $wrkdir/pkg_install/admin/pkg_admin $wrkdir/sbin/pkg_admin"
1311run_cmd "$install_sh -c -o $user -g $group -m 755 $wrkdir/pkg_install/create/pkg_create $wrkdir/sbin/pkg_create" 1311run_cmd "$install_sh -c -o $user -g $group -m 755 $wrkdir/pkg_install/create/pkg_create $wrkdir/sbin/pkg_create"
1312run_cmd "$install_sh -c -o $user -g $group -m 755 $wrkdir/pkg_install/info/pkg_info $wrkdir/sbin/pkg_info" 1312run_cmd "$install_sh -c -o $user -g $group -m 755 $wrkdir/pkg_install/info/pkg_info $wrkdir/sbin/pkg_info"
1313echo "PKG_ADD_CMD?= $wrkdir/sbin/pkg_add" >> ${BOOTSTRAP_MKCONF} 1313echo "PKG_ADD_CMD?= $wrkdir/sbin/pkg_add" >> ${BOOTSTRAP_MKCONF}
1314echo "PKG_ADMIN_CMD?= $wrkdir/sbin/pkg_admin" >> ${BOOTSTRAP_MKCONF} 1314echo "PKG_ADMIN_CMD?= $wrkdir/sbin/pkg_admin" >> ${BOOTSTRAP_MKCONF}
1315echo "PKG_CREATE_CMD?= $wrkdir/sbin/pkg_create" >> ${BOOTSTRAP_MKCONF} 1315echo "PKG_CREATE_CMD?= $wrkdir/sbin/pkg_create" >> ${BOOTSTRAP_MKCONF}
1316echo "PKG_INFO_CMD?= $wrkdir/sbin/pkg_info" >> ${BOOTSTRAP_MKCONF} 1316echo "PKG_INFO_CMD?= $wrkdir/sbin/pkg_info" >> ${BOOTSTRAP_MKCONF}
1317 1317
1318MAKECONF=$wrkdir/mk.conf 1318MAKECONF=$wrkdir/mk.conf
1319export MAKECONF 1319export MAKECONF
1320 1320