commit: d09cd8b5c3bc39cb4099d4f1d371f25dfba8f5af Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Sep 6 22:03:37 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Sep 6 22:04:38 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d09cd8b5
app-shells/bash: set BASH_LOADABLES_PATH Without this, bash has: > BASH_LOADABLES_PATH="/usr/local/lib/bash:/usr/lib/bash:/opt/local/lib/bash:/usr/pkg/lib/bash:/opt/pkg/lib/bash:." That won't pick up even the place we install bash's own plugins to, let alone where other packages might expect it. For the same reason, we can't really just change it to /usr/lib/bash even if it might make sense to given we don't have multilib bash. Closes: https://bugs.gentoo.org/959687 Signed-off-by: Sam James <sam <AT> gentoo.org> app-shells/bash/{bash-9999.ebuild => bash-5.3_p3-r2.ebuild} | 10 +++++----- ...pre20250904.ebuild => bash-5.4_alpha_pre20250904-r1.ebuild} | 1 + app-shells/bash/bash-5.4_alpha_pre20250904.ebuild | 1 + app-shells/bash/bash-9999.ebuild | 1 + 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app-shells/bash/bash-9999.ebuild b/app-shells/bash/bash-5.3_p3-r2.ebuild similarity index 97% copy from app-shells/bash/bash-9999.ebuild copy to app-shells/bash/bash-5.3_p3-r2.ebuild index 9c4d87cd6f0a..6d6415057075 100644 --- a/app-shells/bash/bash-9999.ebuild +++ b/app-shells/bash/bash-5.3_p3-r2.ebuild @@ -15,7 +15,7 @@ MY_PV=${MY_PV/_/-} MY_P=${PN}-${MY_PV} MY_PATCHES=() -# Determine the patchlevel. +# Determine the patchlevel. See https://ftp.gnu.org/gnu/bash/bash-5.3-patches/. case ${PV} in 9999|*_alpha*|*_beta*|*_rc*) # Set a negative patchlevel to indicate that it's a pre-release. @@ -101,7 +101,8 @@ PATCHES=( #"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}/ # Patches to or from Chet, posted to the bug-bash mailing list. - "${FILESDIR}/${PN}-5.0-syslog-history-extern.patch" + "${FILESDIR}"/${PN}-5.0-syslog-history-extern.patch + "${FILESDIR}"/${PN}-5.3-read-sys.patch ) pkg_setup() { @@ -167,10 +168,8 @@ src_configure() { # Upstream only test with Bison and require GNUisms like YYEOF and # YYERRCODE. The former at least may be in POSIX soon: # https://www.austingroupbugs.net/view.php?id=1269. - # # configure warns on use of non-Bison but doesn't abort. The result - # may misbehave at runtime. Chet also advises against use of byacc: - # https://lists.gnu.org/archive/html/bug-bash/2025-08/msg00115.html + # may misbehave at runtime. unset -v YACC if tc-is-cross-compiler; then @@ -200,6 +199,7 @@ src_configure() { append-cppflags \ -DDEFAULT_PATH_VALUE=\'\""${EPREFIX}"/usr/local/sbin:"${EPREFIX}"/usr/local/bin:"${EPREFIX}"/usr/sbin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/bin\"\' \ -DSTANDARD_UTILS_PATH=\'\""${EPREFIX}"/bin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/usr/sbin\"\' \ + -DDEFAULT_LOADABLE_BUILTINS_PATH=\'\""${EPREFIX}"/usr/local/$(get_libdir)/bash:"${EPREFIX}"/usr/$(get_libdir)/bash\"\' \ -DSYS_BASHRC=\'\""${EPREFIX}"/etc/bash/bashrc\"\' \ -DSYS_BASH_LOGOUT=\'\""${EPREFIX}"/etc/bash/bash_logout\"\' \ -DNON_INTERACTIVE_LOGIN_SHELLS \ diff --git a/app-shells/bash/bash-5.4_alpha_pre20250904.ebuild b/app-shells/bash/bash-5.4_alpha_pre20250904-r1.ebuild similarity index 98% copy from app-shells/bash/bash-5.4_alpha_pre20250904.ebuild copy to app-shells/bash/bash-5.4_alpha_pre20250904-r1.ebuild index 7e3302cc96bf..7fde1dd927ec 100644 --- a/app-shells/bash/bash-5.4_alpha_pre20250904.ebuild +++ b/app-shells/bash/bash-5.4_alpha_pre20250904-r1.ebuild @@ -198,6 +198,7 @@ src_configure() { append-cppflags \ -DDEFAULT_PATH_VALUE=\'\""${EPREFIX}"/usr/local/sbin:"${EPREFIX}"/usr/local/bin:"${EPREFIX}"/usr/sbin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/bin\"\' \ -DSTANDARD_UTILS_PATH=\'\""${EPREFIX}"/bin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/usr/sbin\"\' \ + -DDEFAULT_LOADABLE_BUILTINS_PATH=\'\""${EPREFIX}"/usr/local/$(get_libdir)/bash:"${EPREFIX}"/usr/$(get_libdir)/bash\"\' \ -DSYS_BASHRC=\'\""${EPREFIX}"/etc/bash/bashrc\"\' \ -DSYS_BASH_LOGOUT=\'\""${EPREFIX}"/etc/bash/bash_logout\"\' \ -DNON_INTERACTIVE_LOGIN_SHELLS \ diff --git a/app-shells/bash/bash-5.4_alpha_pre20250904.ebuild b/app-shells/bash/bash-5.4_alpha_pre20250904.ebuild index 7e3302cc96bf..7fde1dd927ec 100644 --- a/app-shells/bash/bash-5.4_alpha_pre20250904.ebuild +++ b/app-shells/bash/bash-5.4_alpha_pre20250904.ebuild @@ -198,6 +198,7 @@ src_configure() { append-cppflags \ -DDEFAULT_PATH_VALUE=\'\""${EPREFIX}"/usr/local/sbin:"${EPREFIX}"/usr/local/bin:"${EPREFIX}"/usr/sbin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/bin\"\' \ -DSTANDARD_UTILS_PATH=\'\""${EPREFIX}"/bin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/usr/sbin\"\' \ + -DDEFAULT_LOADABLE_BUILTINS_PATH=\'\""${EPREFIX}"/usr/local/$(get_libdir)/bash:"${EPREFIX}"/usr/$(get_libdir)/bash\"\' \ -DSYS_BASHRC=\'\""${EPREFIX}"/etc/bash/bashrc\"\' \ -DSYS_BASH_LOGOUT=\'\""${EPREFIX}"/etc/bash/bash_logout\"\' \ -DNON_INTERACTIVE_LOGIN_SHELLS \ diff --git a/app-shells/bash/bash-9999.ebuild b/app-shells/bash/bash-9999.ebuild index 9c4d87cd6f0a..3d7aff8378bb 100644 --- a/app-shells/bash/bash-9999.ebuild +++ b/app-shells/bash/bash-9999.ebuild @@ -200,6 +200,7 @@ src_configure() { append-cppflags \ -DDEFAULT_PATH_VALUE=\'\""${EPREFIX}"/usr/local/sbin:"${EPREFIX}"/usr/local/bin:"${EPREFIX}"/usr/sbin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/bin\"\' \ -DSTANDARD_UTILS_PATH=\'\""${EPREFIX}"/bin:"${EPREFIX}"/usr/bin:"${EPREFIX}"/sbin:"${EPREFIX}"/usr/sbin\"\' \ + -DDEFAULT_LOADABLE_BUILTINS_PATH=\'\""${EPREFIX}"/usr/local/$(get_libdir)/bash:"${EPREFIX}"/usr/$(get_libdir)/bash\"\' \ -DSYS_BASHRC=\'\""${EPREFIX}"/etc/bash/bashrc\"\' \ -DSYS_BASH_LOGOUT=\'\""${EPREFIX}"/etc/bash/bash_logout\"\' \ -DNON_INTERACTIVE_LOGIN_SHELLS \
