summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabian Groffen <grobian@gentoo.org>2021-01-30 11:03:23 +0100
committerFabian Groffen <grobian@gentoo.org>2021-01-30 11:03:23 +0100
commitde8c1045d546ab6cb393ec6a08b2aaff347f1664 (patch)
treeea667440dc8a91d6c61f26927279cb53f7de27b1
parentsys-apps/sed: drop ~x86-macos (diff)
downloadprefix-de8c1045d546ab6cb393ec6a08b2aaff347f1664.tar.gz
prefix-de8c1045d546ab6cb393ec6a08b2aaff347f1664.tar.bz2
prefix-de8c1045d546ab6cb393ec6a08b2aaff347f1664.zip
scripts/auto-bootstraps/dobootstrap: drop libressl bootstrap support
libressl is going away, so don't support new bootstraps for it anymore Signed-off-by: Fabian Groffen <grobian@gentoo.org>
-rwxr-xr-xscripts/auto-bootstraps/dobootstrap5
1 files changed, 2 insertions, 3 deletions
diff --git a/scripts/auto-bootstraps/dobootstrap b/scripts/auto-bootstraps/dobootstrap
index 50b550f0ba..dec21808ad 100755
--- a/scripts/auto-bootstraps/dobootstrap
+++ b/scripts/auto-bootstraps/dobootstrap
@@ -109,7 +109,8 @@ do_prepare() {
keepalive=$(type -P caffeinate)
[[ -x ${keepalive} ]] && keepalive+=" -i -m -s" || keepalive=
- local libressluse="libressl -curl_ssl_openssl curl_ssl_libressl"
+ # reminder: MAKE_CONF_ADDITIONAL_USE can be set to add global
+ # USE-flags in make.conf prior to stage2 (first emerge usage)
starttime=${SECONDS}
env -i \
HOME=${EPREFIX} \
@@ -120,7 +121,6 @@ do_prepare() {
EPREFIX=${EPREFIX} \
${GENTOO_MIRRORS+GENTOO_MIRRORS="${GENTOO_MIRRORS}"} \
${DOLOCAL+DOLOCAL=1} \
- ${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} \
@@ -199,7 +199,6 @@ case $1 in
fi
for arg in "${@:1}" ; do
case "${arg}" in
- libressl) export DOLIBRESSL=1 ;;
latesttree) export LATEST_TREE_YES=1 ;;
norap|no-rap) export PREFIX_DISABLE_RAP=yes ;;
32|64) bitw=${arg} ;;