From b7e3e4511e2d9122b4a7e96293928ff5b60c665d Mon Sep 17 00:00:00 2001 From: "Alexander D. Kanevskiy" Date: Sun, 5 Jun 2016 14:05:29 +0300 Subject: [PATCH] glibc: allow users to define locales on local storage Signed-off-by: Alexander D. Kanevskiy --- packages/devel/glibc/package.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/packages/devel/glibc/package.mk b/packages/devel/glibc/package.mk index 021073377c2..c7d2bfd365f 100644 --- a/packages/devel/glibc/package.mk +++ b/packages/devel/glibc/package.mk @@ -65,7 +65,7 @@ fi NSS_CONF_DIR="$PKG_BUILD/nss" GLIBC_EXCLUDE_BIN="catchsegv gencat getconf iconv iconvconfig ldconfig" -GLIBC_EXCLUDE_BIN="$GLIBC_EXCLUDE_BIN localedef makedb mtrace pcprofiledump" +GLIBC_EXCLUDE_BIN="$GLIBC_EXCLUDE_BIN makedb mtrace pcprofiledump" GLIBC_EXCLUDE_BIN="$GLIBC_EXCLUDE_BIN pldd rpcgen sln sotruss sprof xtrace" pre_build_target() { @@ -137,15 +137,18 @@ post_makeinstall_target() { rm -rf $INSTALL/usr/lib/*.map rm -rf $INSTALL/var -# remove locales and charmaps - rm -rf $INSTALL/usr/share/i18n/charmaps if [ ! "$GLIBC_LOCALES" = yes ]; then + # remove locales and charmaps + rm -rf $INSTALL/usr/share/i18n/charmaps rm -rf $INSTALL/usr/share/i18n/locales mkdir -p $INSTALL/usr/share/i18n/locales cp -PR $ROOT/$PKG_BUILD/localedata/locales/POSIX $INSTALL/usr/share/i18n/locales + mkdir -p $INSTALL/usr/share/i18n/charmaps + cp -PR $ROOT/$PKG_BUILD/localedata/charmaps/UTF* $INSTALL/usr/share/i18n/charmaps fi + ln -s /storage/.config/locale $INSTALL/usr/lib/locale # create default configs mkdir -p $INSTALL/etc