commit: 0ccf7c8d3af43ed124903a51a56ec9777bcbf18d Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Mon Nov 23 10:26:16 2020 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Mon Nov 23 10:26:16 2020 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=0ccf7c8d
scripts/bootstrap-prefix: use xattr-fixed Portage to bootstrap in addition, set SDK in use in tmp offset too Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> scripts/bootstrap-prefix.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index 80c2b8eb8b..458d18cc55 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -656,8 +656,8 @@ bootstrap_portage() { # STABLE_PV that is known to work. Intended for power users only. ## It is critical that STABLE_PV is the lastest (non-masked) version that is ## included in the snapshot for bootstrap_tree. - STABLE_PV="3.0.8" - [[ ${TESTING_PV} == latest ]] && TESTING_PV="3.0.8" + STABLE_PV="3.0.10.1" + [[ ${TESTING_PV} == latest ]] && TESTING_PV="3.0.10.1" PV="${TESTING_PV:-${STABLE_PV}}" A=prefix-portage-${PV}.tar.bz2 einfo "Bootstrapping ${A%-*}" @@ -1743,6 +1743,9 @@ bootstrap_stage2() { echo "# DARWIN_USE_GCC block" echo "sys-devel/gcc ~ppc-macos" } >> "${ROOT}"/tmp/etc/portage/package.accept_keywords + + rm -f "${ROOT}"/tmp/MacOSX.sdk + ( cd "${ROOT}"/tmp && ln -s ../MacOSX.sdk ) fi # cmake has some external dependencies which require autoconf, etc.