[gentoo-commits] repo/gentoo:master commit in: sys-libs/glibc/

[Mike Gilbert]

commit:     bd8116a913946503c2647d5ea36f7318a37b9cd6
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 15 16:12:58 2021 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Mon Nov 15 16:12:58 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd8116a9

sys-libs/glibc: avoid duplicate slashes in locale-gen call

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 sys-libs/glibc/glibc-2.34-r2.ebuild | 4 ++--
 sys-libs/glibc/glibc-9999.ebuild    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sys-libs/glibc/glibc-2.34-r2.ebuild 
b/sys-libs/glibc/glibc-2.34-r2.ebuild
index 851820e3c05e..4510d31aeb66 100644
--- a/sys-libs/glibc/glibc-2.34-r2.ebuild
+++ b/sys-libs/glibc/glibc-2.34-r2.ebuild
@@ -1196,13 +1196,13 @@ run_locale_gen() {
                root="$2"
        fi
 
-       local locale_list="${root}/etc/locale.gen"
+       local locale_list="${root%/}/etc/locale.gen"
 
        pushd "${ED}"/$(get_libdir) >/dev/null
 
        if [[ -z $(locale-gen --list --config "${locale_list}") ]] ; then
                [[ -z ${inplace} ]] && ewarn "Generating all locales; edit 
/etc/locale.gen to save time/space"
-               locale_list="${root}/usr/share/i18n/SUPPORTED"
+               locale_list="${root%/}/usr/share/i18n/SUPPORTED"
        fi
 
        set -- locale-gen ${inplace} --jobs $(makeopts_jobs) --config 
"${locale_list}" \

diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index d62fe8108de1..72cca561f703 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -1197,13 +1197,13 @@ run_locale_gen() {
                root="$2"
        fi
 
-       local locale_list="${root}/etc/locale.gen"
+       local locale_list="${root%/}/etc/locale.gen"
 
        pushd "${ED}"/$(get_libdir) >/dev/null
 
        if [[ -z $(locale-gen --list --config "${locale_list}") ]] ; then
                [[ -z ${inplace} ]] && ewarn "Generating all locales; edit 
/etc/locale.gen to save time/space"
-               locale_list="${root}/usr/share/i18n/SUPPORTED"
+               locale_list="${root%/}/usr/share/i18n/SUPPORTED"
        fi
 
        set -- locale-gen ${inplace} --jobs $(makeopts_jobs) --config 
"${locale_list}" \