commit: 941f508fba6880b5d189c8fc6681bf9800a6e05b Author: Bart Oldeman <bart.oldeman <AT> calculquebec <DOT> ca> AuthorDate: Fri Mar 17 14:47:51 2023 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Tue Mar 21 17:36:45 2023 +0000 URL: https://gitweb.gentoo.org/proj/locale-gen.git/commit/?id=941f508f
Fix use of EROOT to be compatible with EAPI 7+ EROOT no longer has a trailing slash, so replace it with "${EROOT%/}/" to avoid errors such as: /home/oldeman/eessi3/usr/sbin/locale-gen: line 168: /home/oldeman/eessi3usr/bin/localedef: No such file or directory * Unable to parse the output of your localedef utility. * File a bug about this issue and include the output of 'localedef --help'. in stage3.log when bootstrapping Gentoo Prefix. See also: https://mgorny.pl/articles/the-ultimate-guide-to-eapi-7.html#d-ed-root-eroot-no-longer-have-a-trailing-slash Closes: https://bugs.gentoo.org/883457 Signed-off-by: Bart Oldeman <bart.oldeman <AT> calculquebec.ca> Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> locale-gen | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/locale-gen b/locale-gen index 8d27202..d0e109e 100755 --- a/locale-gen +++ b/locale-gen @@ -124,17 +124,17 @@ fi : "${EROOT:=${EPREFIX}/}" if [[ ${EROOT} != "/" ]] ; then - einfo "Using locale.gen from ${EROOT}etc/" + einfo "Using locale.gen from ${EROOT%/}/etc/" fi if [[ -n ${DESTDIR} ]] ; then DESTDIR="${DESTDIR%/}/" einfo "Building locales in DESTDIR '${DESTDIR}'" else - DESTDIR=${EROOT} + DESTDIR="${EROOT%/}/" fi -: "${CONFIG:=${EROOT}etc/locale.gen}" +: "${CONFIG:=${EROOT%/}/etc/locale.gen}" LOCALES=${DESTDIR}usr/share/i18n/locales CHARMAPS=${DESTDIR}usr/share/i18n/charmaps SUPPORTED=${DESTDIR}usr/share/i18n/SUPPORTED