[OE-core] [CONSOLIDATED PULL 09/20] eglibc-package: don't fail without localedef/gconv
Saul Wold
sgw at linux.intel.com
Thu Jul 21 07:52:57 UTC 2011
From: Martin Jansa <Martin.Jansa at gmail.com>
* in some cases we don't have localedef/gconv built
ie when DISTRO_FEATURES lacks one of libc-charsets, libc-locales, libc-locale-code
then is better ignore localedef/gconv instead of do_install_locale
failing like in this bugreport:
http://bugzilla.yoctoproject.org/show_bug.cgi?id=1209
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
meta/recipes-core/eglibc/eglibc-package.inc | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc
index faf68f7..9e71150 100644
--- a/meta/recipes-core/eglibc/eglibc-package.inc
+++ b/meta/recipes-core/eglibc/eglibc-package.inc
@@ -98,8 +98,12 @@ do_install_locale () {
if [ "${base_libdir}" != "${libdir}" ]; then
cp -fpPR ${D}${base_libdir}/* ${dest}${base_libdir}
fi
- mv ${D}${bindir}/localedef ${dest}${bindir}
- mv ${D}${libdir}/gconv ${dest}${libdir}
+ if [ -f ${D}${bindir}/localedef ]; then
+ mv -f ${D}${bindir}/localedef ${dest}${bindir}
+ fi
+ if [ -f ${D}${libdir}/gconv ]; then
+ mv -f ${D}${libdir}/gconv ${dest}${libdir}
+ fi
cp -fpPR ${D}${libdir}/* ${dest}${libdir}
mv ${D}${datadir}/i18n ${dest}${datadir}
cp -fpPR ${D}${datadir}/* ${dest}${datadir}
--
1.7.3.4
More information about the Openembedded-core
mailing list