diff options
| author | Phil Blundell <pb@pbcl.net> | 2011-07-08 20:48:39 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-08 22:56:03 +0100 |
| commit | f825e4ca619d3dc9c650343327a753eeb4a50e51 (patch) | |
| tree | 4d655cda85e4c65927051d40e902ef9ed7a42db3 /meta | |
| parent | 93ce74a299832ca7f24b4ce1b951abffa0232612 (diff) | |
| download | openembedded-core-f825e4ca619d3dc9c650343327a753eeb4a50e51.tar.gz openembedded-core-f825e4ca619d3dc9c650343327a753eeb4a50e51.tar.bz2 openembedded-core-f825e4ca619d3dc9c650343327a753eeb4a50e51.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.
Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-core/eglibc/eglibc-package.inc | 6 |
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} |