diff options
Diffstat (limited to 'meta/recipes-core/glibc/glibc-package.inc')
-rw-r--r-- | meta/recipes-core/glibc/glibc-package.inc | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/meta/recipes-core/glibc/glibc-package.inc b/meta/recipes-core/glibc/glibc-package.inc index a1d79b3075..ff17a193c3 100644 --- a/meta/recipes-core/glibc/glibc-package.inc +++ b/meta/recipes-core/glibc/glibc-package.inc | |||
@@ -162,21 +162,28 @@ bashscripts = "mtrace sotruss xtrace" | |||
162 | do_stash_locale () { | 162 | do_stash_locale () { |
163 | dest=${LOCALESTASH} | 163 | dest=${LOCALESTASH} |
164 | install -d ${dest}${base_libdir} ${dest}${bindir} ${dest}${libdir} ${dest}${datadir} | 164 | install -d ${dest}${base_libdir} ${dest}${bindir} ${dest}${libdir} ${dest}${datadir} |
165 | if [ "${base_libdir}" != "${libdir}" ]; then | 165 | # Hide away the locale data from the deployment |
166 | cp -fpPR ${D}${base_libdir}/* ${dest}${base_libdir} | ||
167 | fi | ||
168 | if [ -e ${D}${bindir}/localedef ]; then | 166 | if [ -e ${D}${bindir}/localedef ]; then |
169 | mv -f ${D}${bindir}/localedef ${dest}${bindir} | 167 | mv -f ${D}${bindir}/localedef ${dest}${bindir} |
170 | fi | 168 | fi |
171 | if [ -e ${D}${libdir}/gconv ]; then | 169 | if [ -e ${D}${libdir}/gconv ]; then |
172 | mv -f ${D}${libdir}/gconv ${dest}${libdir} | 170 | mv -f ${D}${libdir}/gconv ${dest}${libdir} |
173 | fi | 171 | fi |
174 | if [ -e ${D}${exec_prefix}/lib ]; then | ||
175 | cp -fpPR ${D}${exec_prefix}/lib ${dest}${exec_prefix} | ||
176 | fi | ||
177 | if [ -e ${D}${datadir}/i18n ]; then | 172 | if [ -e ${D}${datadir}/i18n ]; then |
178 | mv ${D}${datadir}/i18n ${dest}${datadir} | 173 | mv ${D}${datadir}/i18n ${dest}${datadir} |
179 | fi | 174 | fi |
175 | |||
176 | # Make a copy of all the libraries into the locale stash | ||
177 | cp -fpPR ${D}${libdir}/* ${dest}${libdir} | ||
178 | if [ "${base_libdir}" != "${libdir}" ]; then | ||
179 | cp -fpPR ${D}${base_libdir}/* ${dest}${base_libdir} | ||
180 | fi | ||
181 | if [ -e ${D}${exec_prefix}/lib ]; then | ||
182 | if [ ${exec_prefix}/lib != ${base_libdir} ] && [ ${exec_prefix}/lib != ${libdir} ]; then | ||
183 | cp -fpPR ${D}${exec_prefix}/lib ${dest}${exec_prefix} | ||
184 | fi | ||
185 | fi | ||
186 | |||
180 | cp -fpPR ${D}${datadir}/* ${dest}${datadir} | 187 | cp -fpPR ${D}${datadir}/* ${dest}${datadir} |
181 | rm -rf ${D}${datadir}/locale/ | 188 | rm -rf ${D}${datadir}/locale/ |
182 | cp -fpPR ${WORKDIR}/SUPPORTED ${dest} | 189 | cp -fpPR ${WORKDIR}/SUPPORTED ${dest} |