diff options
| author |   Bart Oldeman <bart.oldeman@calculquebec.ca> | 2023-03-17 14:47:51 +0000 |
|---|---|---|
| committer |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2023-03-21 18:36:45 +0100 |
| commit | 941f508fba6880b5d189c8fc6681bf9800a6e05b (patch) | |
| tree | 055ee8354e3cdb5cb7d3a9c553f7d3fbcf5a6161 | |
| parent | document bash version requirements (diff) | |
| download | locale-gen-941f508fba6880b5d189c8fc6681bf9800a6e05b.tar.gz locale-gen-941f508fba6880b5d189c8fc6681bf9800a6e05b.tar.bz2 locale-gen-941f508fba6880b5d189c8fc6681bf9800a6e05b.zip | |
Fix use of EROOT to be compatible with EAPI 7+locale-gen-2.23
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@calculquebec.ca>
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
| -rwxr-xr-x | locale-gen | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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 |