commit: 5013468354bf6d22bb1478a24656a37e5e36bb18 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Thu Jun 6 08:14:56 2019 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Thu Jun 6 08:14:56 2019 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=50134683
scripts/auto-bootstraps/dobootstrap: set libressl flags for CURL_SSL portage-utils wants openssl/libressl and gpgme, which needs curl curl apparently has a different way of selecting ssl implementation, so set the flags for those USE_EXPAND to unbreak the dependency tree Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> scripts/auto-bootstraps/dobootstrap | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/auto-bootstraps/dobootstrap b/scripts/auto-bootstraps/dobootstrap index 5a37b5391d..c7f471315d 100755 --- a/scripts/auto-bootstraps/dobootstrap +++ b/scripts/auto-bootstraps/dobootstrap @@ -109,6 +109,7 @@ do_prepare() { keepalive=$(type -P caffeinate) [[ -x ${keepalive} ]] && keepalive+=" -i -m -s" || keepalive= + local libressluse="libressl -curl_ssl_openssl curl_ssl_libressl" starttime=${SECONDS} env -i \ HOME=${EPREFIX} \ @@ -119,7 +120,7 @@ do_prepare() { EPREFIX=${EPREFIX} \ ${GENTOO_MIRRORS+GENTOO_MIRRORS="${GENTOO_MIRRORS}"} \ ${DOLOCAL+DOLOCAL=1} \ - ${DOLIBRESSL+MAKE_CONF_ADDITIONAL_USE=libressl} \ + ${DOLIBRESSL+MAKE_CONF_ADDITIONAL_USE="${libressluse}"} \ ${RESUME+RESUME=1} \ ${LATEST_TREE_YES+LATEST_TREE_YES=1} \ ${TREE_FROM_SRC+TREE_FROM_SRC=}${TREE_FROM_SRC} \