| Submitter | Phil Blundell |
|---|---|
| Date | July 8, 2011, 7:48 p.m. |
| Message ID | <1310154519.18564.17.camel@lenovo.internal.reciva.com> |
| Download | mbox | patch |
| Permalink | /patch/7265/ |
| State | New, archived |
| Headers | show |
Comments
On Fri, 2011-07-08 at 20:48 +0100, Phil Blundell wrote: > Otherwise the following "mv ${libdir}/gconv" fails because the destination > has already been created. > > Signed-off-by: Phil Blundell <philb@gnu.org> > --- > meta/recipes-core/eglibc/eglibc-package.inc | 6 ++++-- > 1 files changed, 4 insertions(+), 2 deletions(-) Merged to master, thanks. Richard
Patch
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc index 1c6626c..f29417f 100644 --- a/meta/recipes-core/eglibc/eglibc-package.inc +++ b/meta/recipes-core/eglibc/eglibc-package.inc @@ -91,9 +91,11 @@ inherit libc-common do_install_locale () { dest=${D}/${includedir}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS} install -d ${dest}${base_libdir} ${dest}${bindir} ${dest}${libdir} ${dest}${datadir} - cp -fpPR ${D}${base_libdir}/* ${dest}${base_libdir} + 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} + mv ${D}${libdir}/gconv ${dest}${libdir} cp -fpPR ${D}${libdir}/* ${dest}${libdir} mv ${D}${datadir}/i18n ${dest}${datadir} cp -fpPR ${D}${datadir}/* ${dest}${datadir}
Otherwise the following "mv ${libdir}/gconv" fails because the destination has already been created. Signed-off-by: Phil Blundell <philb@gnu.org> --- meta/recipes-core/eglibc/eglibc-package.inc | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)