add more locale bashing bits to work around lack of mmap(PROT_WRITE, MAP_SHARED)...

BKrev: 410d8008ARdzrzR9FNP7YAHoFFyKMA

diff --git a/glibc/glibc-package.oe b/glibc/glibc-package.oe
index 041ba02..6cfa913 100644 (file)
--- a/glibc/glibc-package.oe
+++ b/glibc/glibc-package.oe
@@ -9,16 +9,32 @@ do_install() {
        make -f ${WORKDIR}/generate-supported.mk IN="${S}/localedata/SUPPORTED" OUT="${WORKDIR}/SUPPORTED"
 }
 
+TMP_LOCALE="/tmp/locale/${libdir}/locale"
+
 locale_base_postinst() {
 #!/bin/sh
 
-localedef --add-to-archive --inputfile=${datadir}/locales/%s --charmap=${datadir}/charmaps/%s.gz
+rm -rf ${TMP_LOCALE}
+mkdir -p ${TMP_LOCALE}
+if [ -f ${libdir}/locale/locale-archive ]; then
+        cp ${libdir}/locale/locale-archive ${TMP_LOCALE}/
+fi
+localedef --add-to-archive --inputfile=${datadir}/locales/%s --charmap=${datadir}/charmaps/%s.gz --prefix=/tmp/locale
+mv ${TMP_LOCALE}/locale-archive ${libdir}/locale/
+rm -rf ${TMP_LOCALE}
 }
 
 locale_base_postrm() {
 #!/bin/sh
 
-localedef --delete-from-archive --inputfile=${datadir}/locales/%s --charmap=${datadir}/charmaps/%s.gz
+rm -rf ${TMP_LOCALE}
+mkdir -p ${TMP_LOCALE}
+if [ -f ${libdir}/locale/locale-archive ]; then
+       cp ${libdir}/locale/locale-archive ${TMP_LOCALE}/
+fi
+localedef --delete-from-archive --inputfile=${datadir}/locales/%s --charmap=${datadir}/charmaps/%s.gz --prefix=/tmp/locale
+mv ${TMP_LOCALE}/locale-archive ${libdir}/locale/
+rm -rf ${TMP_LOCALE}
 }
 
 python package_do_split_gconvs () {