summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Blundell <pb@pbcl.net>2011-07-08 20:48:39 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-08 22:56:26 +0100
commitab7530ab380fb39edc2acacebe7f1a36fa2ed4ba (patch)
treeaafab485c6dd4b228d531ebb79910424f65e4ce2
parent104a1c2db9117caab778b4d9e9c0e16dac9be49a (diff)
downloadpoky-ab7530ab380fb39edc2acacebe7f1a36fa2ed4ba.tar.gz
poky-ab7530ab380fb39edc2acacebe7f1a36fa2ed4ba.tar.bz2
poky-ab7530ab380fb39edc2acacebe7f1a36fa2ed4ba.zip
eglibc: avoid copying ${libdir} twice if it's the same as ${base_libdir}
Otherwise the following "mv ${libdir}/gconv" fails because the destination has already been created. (From OE-Core rev: f825e4ca619d3dc9c650343327a753eeb4a50e51) Signed-off-by: Phil Blundell <philb@gnu.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/eglibc/eglibc-package.inc6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc
index 1c6626c187..f29417f94f 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}