commit: d81bebc842bfb88532c69c70f45bcf347d6fc15b
Author: Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 20 12:02:00 2018 +0000
Commit: Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Wed Jun 20 12:02:00 2018 +0000
URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=d81bebc8
Revert "Regard stage3 as BDEPEND in terms of EAPI7."
This reverts commit 8207d9c59468ff32600463033821eec20197ca0f.
scripts/bootstrap-prefix.sh | 18 +-----------------
1 file changed, 1 insertion(+), 17 deletions(-)
diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index c746590e22..9c1daa7775 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -670,8 +670,6 @@ bootstrap_portage() {
# in Prefix the sed wrapper is deadly, so kill it
rm -f "${ROOT}"/tmp/usr/lib/portage/bin/ebuild-helpers/sed
- # stage3 PATH should come before stage2
- sed -e '/DEFAULT_PATH/d' -i
"${ROOT}"/tmp/usr/share/portage/config/make.globals
[[ -e "${ROOT}"/tmp/usr/portage ]] || ln -s "${PORTDIR}"
"${ROOT}"/tmp/usr/portage
@@ -1645,7 +1643,7 @@ bootstrap_stage3() {
# stage3 tools should be used first.
# PORTAGE_TMPDIR, EMERGE_LOG_DIR, FEATURES=force-prefix are
# needed with host portage.
- PREROOTPATH="${ROOT}"$(echo usr/lib/llvm/{10,9,8,7,6,5}/bin |
sed "s, ,:${ROOT},g") \
+ PREROOTPATH="${ROOT}"$(echo
/{,tmp/}{usr/,}{,lib/llvm/{10,9,8,7,6,5}/}{s,}bin | sed "s, ,:${ROOT},g") \
EPREFIX="${ROOT}" PORTAGE_TMPDIR="${PORTAGE_TMPDIR}" \
FEATURES="${FEATURES} force-prefix" \
EMERGE_LOG_DIR="${ROOT}"/var/log \
@@ -1725,20 +1723,6 @@ bootstrap_stage3() {
emerge_pkgs --nodeps "${pkgs[@]}" || return 1
fi
- # Move portage from stage2 to stage3, because build
- # dependencies are bootstrapped by stage3. After the
- # introduction of EAPI-7, eclasses now strictly distinguish
- # between build dependencies that are binary compatible with
- # the native build system (CBUILD, BDEPEND) and with the
- # system being built (CHOST, DEPEND).
- #
- # As we don't know the layout of ${ROOT}/usr/lib, do this hack
- # after baselayout.
- [[ -d "${ROOT}"/usr/share/portage ]] || cp -a
"${ROOT}"{/tmp,}/usr/share/portage
- [[ -d "${ROOT}"/usr/lib/portage ]] || cp -a
"${ROOT}"{/tmp,}/usr/lib/portage
- cp -f "${ROOT}"/tmp/usr/{bin,lib/portage/bin/ebuild-helpers}/portageq
- export PORTAGE_OVERRIDE_EPREFIX="${ROOT}"
-
# On some hosts, gcc gets confused now when it uses the new linker,
# see for instance bug #575480. While we would like to hide that
# linker, we can't since we want the compiler to pick it up.
