mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-13 09:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add and use 'localedir' variable

Browse Source 
This avoids the hardcoding of ${libdir}/locale which is all over the place,
and will facilitate use of ${exec_prefix}/lib/locale instead of
${libdir}/locale.

This doesn't actually change any output at this time. Verified this with
buildhistory against the packages produced from core-image-base.

(From OE-Core rev: b744f4cc2912334b8493a89525fd02af8e9b8edf)

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Christopher Larson
2012-09-24 12:00:41 -07:00
committed by Richard Purdie
parent d02f02950e
commit 6ee9ebc425
6 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
meta/recipes-core/eglibc/eglibc-locale.inc
View File

@@ -69,12 +69,12 @@ FILES_localedef = "${bindir}/localedef"
LOCALETREESRC = "${STAGING_INCDIR}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS}"
do_install () {
mkdir -p ${D}${bindir} ${D}${datadir} ${D}${libdir}
mkdir -p ${D}${bindir} ${D}${datadir} ${D}${libdir} ${D}${localedir}
if [ -n "$(ls ${LOCALETREESRC}/${bindir})" ]; then
cp -fpPR ${LOCALETREESRC}/${bindir}/* ${D}${bindir}
fi
if [ -e ${LOCALETREESRC}/${libdir}/locale ]; then
cp -fpPR ${LOCALETREESRC}/${libdir}/locale ${D}${libdir}
if [ -n "$(ls ${LOCALETREESRC}/${localedir})" ]; then
cp -fpPR ${LOCALETREESRC}/${localedir}/* ${D}${localedir}
fi
if [ -e ${LOCALETREESRC}/${libdir}/gconv ]; then
cp -fpPR ${LOCALETREESRC}/${libdir}/gconv ${D}${libdir}

11
meta/recipes-core/eglibc/eglibc-package.inc
View File

@@ -98,7 +98,9 @@ do_install_locale () {
if [ -e ${D}${libdir}/gconv ]; then
mv -f ${D}${libdir}/gconv ${dest}${libdir}
fi
cp -fpPR ${D}${libdir}/* ${dest}${libdir}
if [ -e ${D}${exec_prefix}/lib ]; then
cp -fpPR ${D}${exec_prefix}/lib ${dest}${exec_prefix}
fi
if [ -e ${D}${datadir}/i18n ]; then
mv ${D}${datadir}/i18n ${dest}${datadir}
fi
@@ -113,6 +115,9 @@ PACKAGE_PREPROCESS_FUNCS += "eglibc_package_preprocess"
eglibc_package_preprocess () {
rm -rf ${PKGD}/${includedir}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS}
rm -rf ${PKGD}/${libdir}/locale
rm -rf ${PKGD}/${localedir}
if [ "${libdir}" != "${exec_prefix}/lib" ]; then
# This dir only exists to hold locales
rm -rf ${PKGD}${exec_prefix}/lib
fi
}

1
meta/recipes-core/eglibc/eglibc.inc
View File

@@ -34,6 +34,7 @@ LEAD_SONAME = "libc.so"
CACHED_CONFIGUREVARS += "ac_cv_path_KSH=${base_bindir}/bash \
ac_cv_path_BASH_SHELL=${base_bindir}/bash \
libc_cv_localedir=${localedir} \
libc_cv_ssp=no \
"