commit: 14fbc8f14c4c484e1809e001e262efca9b6f6ecd Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Tue Jul 4 07:07:42 2023 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Tue Jul 4 07:07:42 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=14fbc8f1
scripts/bootstrap-prefix: don't disable readline on bash "Recent" bash (5.1) compiles fine on Darwin 9 with readline enabled. Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> scripts/bootstrap-prefix.sh | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/scripts/bootstrap-prefix.sh b/scripts/bootstrap-prefix.sh index d722e0139f..9c86901e2e 100755 --- a/scripts/bootstrap-prefix.sh +++ b/scripts/bootstrap-prefix.sh @@ -872,14 +872,9 @@ bootstrap_gnu() { # care about manpages at this stage export ac_cv_path_POD2MAN=no - # Darwin9 in particular doesn't compile when using system readline, - # but we don't need any groovy input handling at all, so just disable it - [[ ${PN} == "bash" ]] && myconf="${myconf} --disable-readline" - # On e.g. musl systems bash will crash with a malloc error if we use # bash' internal malloc, so disable it during it this stage - [[ ${PN} == "bash" ]] && \ - myconf="${myconf} --without-bash-malloc" + [[ ${PN} == "bash" ]] && myconf="${myconf} --without-bash-malloc" # Ensure we don't read system-wide shell initialisation, it may # contain cruft, bug #650284 @@ -2187,7 +2182,7 @@ bootstrap_stage3() { # Portage should figure out itself what it needs to do, if anything. einfo "running emerge -uDNv system" estatus "stage3: emerge -uDNv system" - unset CFLAGS CXXFLAGS CPPFLAGS + unset CFLAGS CXXFLAGS CPPFLAGS LDFLAGS emerge --color n -uDNv system || return 1 # Remove anything that we don't need (compilers most likely)