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