eglibc-package: don't fail without localedef/gconv
authorMartin Jansa <Martin.Jansa@gmail.com>
Tue, 19 Jul 2011 16:51:10 +0000 (18:51 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 21 Jul 2011 09:59:18 +0000 (10:59 +0100)
* 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

(From OE-Core rev: 5486cac29db6e67051fff7637a0abc9aeab661e5)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-core/eglibc/eglibc-package.inc

index faf68f7..9e71150 100644 (file)
@@ -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}