sys-libs/glibc: Pass missing parameter to locale-gen

Package-Manager: Portage-2.3.69, Repoman-2.3.16
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>

diff --git a/sys-libs/glibc/glibc-2.30.ebuild b/sys-libs/glibc/glibc-2.30.ebuild
index 2d1e13c28ace119f065c5fa8fd60fd149743f521..9bdb5a434c82e6265dba97873c7009f7628fdf08 100644 (file)
--- a/sys-libs/glibc/glibc-2.30.ebuild
+++ b/sys-libs/glibc/glibc-2.30.ebuild
@@ -1141,16 +1141,23 @@ src_test() {
 run_locale_gen() {
        # if the host locales.gen contains no entries, we'll install everything
        local root="$1"
+       local inplace=""
+
+       if [[ ${root}=="--inplace-glibc" ]] ; then
+               inplace="--inplace-glibc"
+               root="$2"
+       fi
+
        local locale_list="${root}/etc/locale.gen"
 
        pushd "${ED}"/$(get_libdir)
 
        if [[ -z $(locale-gen --list --config "${locale_list}") ]] ; then
-               ewarn "Generating all locales; edit /etc/locale.gen to save time/space"
+               [[ -z ${inplace} ]] && ewarn "Generating all locales; edit /etc/locale.gen to save time/space"
                locale_list="${root}/usr/share/i18n/SUPPORTED"
        fi
 
-       locale-gen --jobs $(makeopts_jobs) --config "${locale_list}" \
+       locale-gen ${inplace} --jobs $(makeopts_jobs) --config "${locale_list}" \
                --destdir "${root}"
 
        popd
@@ -1337,7 +1344,7 @@ glibc_do_src_install() {
 
        # Generate all locales if this is a native build as locale generation
        if use compile-locales && ! is_crosscompile ; then
-               run_locale_gen "${ED}"
+               run_locale_gen --inplace-glibc "${ED}"
                sed -e 's:COMPILED_LOCALES="":COMPILED_LOCALES="1":' -i "${ED}"/usr/sbin/locale-gen || die
        fi
 }

diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 4d0a9edb57a0d99a7333abf50b17d23a74c33bcc..c9d06b2049949ea6475837dd0cf1da27b80551ca 100644 (file)
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -1141,16 +1141,23 @@ src_test() {
 run_locale_gen() {
        # if the host locales.gen contains no entries, we'll install everything
        local root="$1"
+       local inplace=""
+
+       if [[ ${root}=="--inplace-glibc" ]] ; then
+               inplace="--inplace-glibc"
+               root="$2"
+       fi
+
        local locale_list="${root}/etc/locale.gen"
 
        pushd "${ED}"/$(get_libdir)
 
        if [[ -z $(locale-gen --list --config "${locale_list}") ]] ; then
-               ewarn "Generating all locales; edit /etc/locale.gen to save time/space"
+               [[ -z ${inplace} ]] && ewarn "Generating all locales; edit /etc/locale.gen to save time/space"
                locale_list="${root}/usr/share/i18n/SUPPORTED"
        fi
 
-       locale-gen --jobs $(makeopts_jobs) --config "${locale_list}" \
+       locale-gen ${inplace} --jobs $(makeopts_jobs) --config "${locale_list}" \
                --destdir "${root}"
 
        popd
@@ -1337,7 +1344,7 @@ glibc_do_src_install() {
 
        # Generate all locales if this is a native build as locale generation
        if use compile-locales && ! is_crosscompile ; then
-               run_locale_gen "${ED}"
+               run_locale_gen --inplace-glibc "${ED}"
                sed -e 's:COMPILED_LOCALES="":COMPILED_LOCALES="1":' -i "${ED}"/usr/sbin/locale-gen || die
        fi
 }