From f825e4ca619d3dc9c650343327a753eeb4a50e51 Mon Sep 17 00:00:00 2001
From: Phil Blundell <pb@pbcl.net>
Date: Fri, 8 Jul 2011 20:48:39 +0100
Subject: 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.
Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
meta/recipes-core/eglibc/eglibc-package.inc | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
(limited to 'meta')
diff --git a/meta/recipes-core/eglibc/eglibc-package.inc b/meta/recipes-core/eglibc/eglibc-package.inc
index 1c6626c18..f29417f94 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}
--
cgit v1.2.3