From 305e843fbae136da9638123b565d2c22ec792c85 Mon Sep 17 00:00:00 2001 From: stefson Date: Mon, 22 Jul 2019 14:09:28 +0200 Subject: [PATCH] sys-libs/glibc: add guards for run_locale_gen in case of binary merge closes: https://bugs.gentoo.org/680782 Signed-off-by: Steffen Kuhn --- sys-libs/glibc/glibc-2.29-r2.ebuild | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/sys-libs/glibc/glibc-2.29-r2.ebuild b/sys-libs/glibc/glibc-2.29-r2.ebuild index da78a273d19f..9a3b428f8e6e 100644 --- a/sys-libs/glibc/glibc-2.29-r2.ebuild +++ b/sys-libs/glibc/glibc-2.29-r2.ebuild @@ -1140,8 +1140,13 @@ run_locale_gen() { locale_list="${root}/usr/share/i18n/SUPPORTED" fi - locale-gen --jobs $(makeopts_jobs) --config "${locale_list}" \ - --destdir "${root}" + if [[ ${MERGE_TYPE} == !"binary" ]] ; then + locale-gen --jobs $(makeopts_jobs) --config "${locale_list}" \ + --destdir "${root}" + elif [[ ${MERGE_TYPE} = "binary" ]] ; then + locale-gen --jobs 1 --config "${locale_list}" \ + --destdir "${root}" + fi } glibc_do_src_install() {