Patchwork [CONSOLIDATED,PULL,09/20] eglibc-package: don't fail without localedef/gconv

login
register
mail settings
Submitter Saul Wold
Date July 21, 2011, 7:52 a.m.
Message ID <a0756560075e954afd43c6b1fb1ecdb68e35ee56.1311234475.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/8151/
State New, archived
Headers show

Comments

Saul Wold - July 21, 2011, 7:52 a.m.
From: Martin Jansa <Martin.Jansa@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@gmail.com>
---
 meta/recipes-core/eglibc/eglibc-package.inc |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

Patch

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}