Skip to content

Commit 7032312

Browse files
committed
scripts/bootstrap-prefix: attempt to fix b736fab do_emerge_pkgs
Use ROOT, which should be the same between stages, such that we don't reference tmp/tmp. Thanks huxnu for pointing out. Bug: https://bugs.gentoo.org/933079 Signed-off-by: Fabian Groffen <[email protected]>
1 parent 3e9c4bb commit 7032312

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

scripts/bootstrap-prefix.sh

+11-7
Original file line numberDiff line numberDiff line change
@@ -1785,16 +1785,20 @@ do_emerge_pkgs() {
17851785
&& export CFLAGS="${OVERRIDE_CFLAGS}"
17861786
[[ -n ${OVERRIDE_CXXFLAGS} ]] \
17871787
&& export CXXFLAGS="${OVERRIDE_CXXFLAGS}"
1788-
# In the stage3 bootstrap we always prefer to use tools that have been built for
1789-
# stage3; to accomplish this we ensure that it is the first thing evaluated in PATH.
1790-
# Unfortunately, Portage, Python, and Python-exec are often pulled into the depgraph
1791-
# at some point before we're fully boostrapped. To ensure that we don't try and execute
1792-
# ${EPREFIX}/usr/bin/emerge before we're ready, always provide the full path to the
1793-
# bootstrap Python interpreter and emerge script.
1788+
# In the stage3 bootstrap we always prefer to use tools that
1789+
# have been built for stage3; to accomplish this we ensure
1790+
# that it is the first thing evaluated in PATH.
1791+
# Unfortunately, Portage, Python, and Python-exec are often
1792+
# pulled into the depgraph at some point before we're fully
1793+
# boostrapped. To ensure that we don't try and execute
1794+
# ${EPREFIX}/usr/bin/emerge before we're ready, always
1795+
# provide the full path to the bootstrap Python interpreter
1796+
# and emerge script.
17941797
PORTAGE_SYNC_STALE=0 \
17951798
FEATURES="-news ${FEATURES}" \
17961799
USE="${myuse[*]}" \
1797-
"${EPREFIX}"/tmp/bin/python "${EPREFIX}"/tmp/usr/bin/emerge "${eopts[@]}" "${pkg}"
1800+
"${ROOT}"/tmp/bin/python \
1801+
"${ROOT}"/tmp/usr/bin/emerge "${eopts[@]}" "${pkg}"
17981802
) || return 1
17991803
done
18001804
}

0 commit comments

Comments
 (0)