From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E3C3B138334 for ; Thu, 6 Jun 2019 18:56:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E2A3DE09A1; Thu, 6 Jun 2019 18:56:30 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id ADFECE09A1 for ; Thu, 6 Jun 2019 18:56:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1397A34586D for ; Thu, 6 Jun 2019 18:56:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 10640566 for ; Thu, 6 Jun 2019 18:56:27 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1559808896.5013468354bf6d22bb1478a24656a37e5e36bb18.grobian@gentoo> Subject: [gentoo-commits] repo/proj/prefix:master commit in: scripts/auto-bootstraps/ X-VCS-Repository: repo/proj/prefix X-VCS-Files: scripts/auto-bootstraps/dobootstrap X-VCS-Directories: scripts/auto-bootstraps/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 5013468354bf6d22bb1478a24656a37e5e36bb18 X-VCS-Branch: master Date: Thu, 6 Jun 2019 18:56:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a53b7aba-9dc0-4f50-88ad-581f12a82f85 X-Archives-Hash: d644f872b71318413ff15733541816ba commit: 5013468354bf6d22bb1478a24656a37e5e36bb18 Author: Fabian Groffen gentoo org> AuthorDate: Thu Jun 6 08:14:56 2019 +0000 Commit: Fabian Groffen gentoo 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 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} \