diff options
| author | schmonz <schmonz@pkgsrc.org> | 2021-12-27 14:16:30 +0000 |
|---|---|---|
| committer | schmonz <schmonz@pkgsrc.org> | 2021-12-27 14:16:30 +0000 |
| commit | f57e7ec1d5ee9feec15f1ec2c9e8e72e2a1543f2 (patch) | |
| tree | e7ac30e1e44733b6fd8707e650783ed27efd9b94 /bootstrap/bootstrap | |
| parent | f32d6b186ff3ffbfe7e28807355769f5d189116a (diff) | |
| download | pkgsrc-f57e7ec1d5ee9feec15f1ec2c9e8e72e2a1543f2.tar.gz | |
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.
Diffstat (limited to 'bootstrap/bootstrap')
| -rwxr-xr-x | bootstrap/bootstrap | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bootstrap/bootstrap b/bootstrap/bootstrap index 34542ea7fb2..3d8a8dae1a2 100755 --- a/bootstrap/bootstrap +++ b/bootstrap/bootstrap @@ -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> # All rights reserved. @@ -1304,7 +1304,7 @@ LIBS='$LIBS -lnbcompat' $shprog ./configure $configure_quiet_flags -C \ --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" |