mirror of
https://git.yoctoproject.org/poky
synced 2026-09-19 18:49:32 +02:00
Add and use 'localedir' variable
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:
committed by
Richard Purdie
parent
d02f02950e
commit
6ee9ebc425
@@ -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
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user