CVS commit: pkgsrc/bootstrap

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Mon Dec 27 14:16:30 UTC 2021

Modified Files:
        pkgsrc/bootstrap: bootstrap

Log Message:
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@localhost.


To generate a diff of this commit:
cvs rdiff -u -r1.304 -r1.305 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.304 pkgsrc/bootstrap/bootstrap:1.305
--- pkgsrc/bootstrap/bootstrap:1.304    Mon Nov 29 18:32:51 2021
+++ pkgsrc/bootstrap/bootstrap  Mon Dec 27 14:16:30 2021
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: bootstrap,v 1.304 2021/11/29 18:32:51 jperkin Exp $
+# $NetBSD: bootstrap,v 1.305 2021/12/27 14:16:30 schmonz Exp $
 #
 # Copyright (c) 2001-2011 Alistair Crooks <agc%NetBSD.org@localhost>
 # All rights reserved.
@@ -1304,7 +1304,7 @@ LIBS='$LIBS -lnbcompat' $shprog ./config
 --with-pkgdbdir=$pkgdbdir --infodir=$infodir \
 --mandir=$mandir $pkg_install_args && \
 STATIC_LIBARCHIVE=$wrkdir/libarchive/.libs/libarchive.a \
-STATIC_LIBARCHIVE_LDADD=`extra_libarchive_depends` \
+STATIC_LIBARCHIVE_LDADD="`extra_libarchive_depends`" \
 PKGSRC_MACHINE_ARCH="$machine_arch" $bmake $make_quiet_flags -j$make_jobs)"
 run_cmd "$install_sh -c -o $user -g $group -m 755 $wrkdir/pkg_install/add/pkg_add $wrkdir/sbin/pkg_add"
 run_cmd "$install_sh -c -o $user -g $group -m 755 $wrkdir/pkg_install/admin/pkg_admin $wrkdir/sbin/pkg_admin"