summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2020-01-18 20:26:54 -0800
committerZac Medico <zmedico@gentoo.org>2020-01-18 20:38:13 -0800
commit6cfec967ac5ad3894f6ce0e6c7289406bd10d480 (patch)
tree80ff2210017606646190259af74240a9b3313385
parentdev-python/pypy3-exe: Fix building w/ USE=-low-memory (diff)
downloadgentoo-6cfec967ac5ad3894f6ce0e6c7289406bd10d480.tar.gz
gentoo-6cfec967ac5ad3894f6ce0e6c7289406bd10d480.tar.bz2
gentoo-6cfec967ac5ad3894f6ce0e6c7289406bd10d480.zip
scripts/bootstrap.sh: fix emerge --resume args
Since the emerge argument parser change from bug 673400, positional arguments must come after all optional arguments. Reviewed-by: Michael Everitt <m.j.everitt@iee.org> Bug: https://bugs.gentoo.org/673400 Signed-off-by: Zac Medico <zmedico@gentoo.org>
-rwxr-xr-xscripts/bootstrap.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/bootstrap.sh b/scripts/bootstrap.sh
index 3fd1c5a0409..d375542f899 100755
--- a/scripts/bootstrap.sh
+++ b/scripts/bootstrap.sh
@@ -330,14 +330,15 @@ export USE="-* bootstrap ${ALLOWED_USE} ${BOOTSTRAP_USE}"
if [ ${BOOTSTRAP_STAGE} -le 2 ] ; then
show_status 3 Emerging packages
if [[ ${RESUME} -eq 1 ]] ; then
+ STRAP_EMERGE_POSARGS=""
STRAP_EMERGE_OPTS="${STRAP_EMERGE_OPTS} --resume"
cp /var/run/bootstrap-mtimedb /var/cache/edb
else
- STRAP_EMERGE_OPTS="${STRAP_EMERGE_OPTS} \
+ STRAP_EMERGE_POSARGS="\
${myOS_HEADERS} ${myTEXINFO} ${myGETTEXT} ${myBINUTILS} \
${myGCC} ${myLIBC} ${myBASELAYOUT} ${myZLIB}"
fi
- ${V_ECHO} emerge ${STRAP_EMERGE_OPTS} || cleanup 1
+ ${V_ECHO} emerge ${STRAP_EMERGE_OPTS} ${STRAP_EMERGE_POSARGS} || cleanup 1
echo -------------------------------------------------------------------------------
set_bootstrap_stage 3
fi