commit:     66588dcd0aa2508fad7ab8db5e92a0b4c2e75d6d
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Fri Dec  4 10:58:24 2020 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Fri Dec  4 10:58:24 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=66588dcd

scripts/bootstrap-prefix: fix gawk merge in stage3 for darwin9

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 scripts/bootstrap-prefix.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh
index 06f78c9390..bed81f04ea 100755
--- a/scripts/bootstrap-prefix.sh
+++ b/scripts/bootstrap-prefix.sh
@@ -2039,7 +2039,8 @@ bootstrap_stage3() {
        rm -f "${ROOT}"/etc/ld.so.conf.d/stage2.conf
 
        # need special care, it depends on texinfo, #717786
-       pre_emerge_pkgs --nodeps sys-apps/gawk || return 1
+       # but requires a recent readline else breaks on old, e.g. darwin9
+       pre_emerge_pkgs --nodeps sys-libs/readline sys-apps/gawk || return 1
 
        ( cd "${ROOT}"/usr/bin && test ! -e python && rm -f 
python${PYTHONMAJMIN} )
        # Use $ROOT tools where possible from now on.

Reply via email to