summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2011-12-28 09:34:00 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-01-03 12:10:47 +0000
commitf4ffe39450c3da33b24766a5f83ad06cc8ff950c (patch)
treea45a2213325334f4702782a7ed06f0fc46ddc1f0
parentca76443522a6bb38d239b9aa0c7932cd44446ff8 (diff)
downloadopenembedded-core-f4ffe39450c3da33b24766a5f83ad06cc8ff950c.tar.gz
openembedded-core-f4ffe39450c3da33b24766a5f83ad06cc8ff950c.tar.bz2
openembedded-core-f4ffe39450c3da33b24766a5f83ad06cc8ff950c.tar.xz
openembedded-core-f4ffe39450c3da33b24766a5f83ad06cc8ff950c.zip
autotools.bbclass: fix cp error for empty dir
the .../usr/share/aclocal is empty for build from scratch. so avoid cp error if the directory is empty. Fixes this error, which is thrown before pseudo is built: | cp: cannot stat `/builddisk/build/build0/tmp/sysroots/x86_64-linux/usr/share/aclocal/*': No such file or directory NOTE: package libtool-native-2.4.2-r0.0: task do_configure: Failed Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
-rw-r--r--meta/classes/autotools.bbclass4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index 7536bac39..2f462ff93 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -122,7 +122,9 @@ autotools_do_configure() {
# We avoid this by taking a copy here and then files cannot disappear.
if [ -d ${STAGING_DATADIR}/aclocal ]; then
mkdir -p ${B}/aclocal-copy/
- cp ${STAGING_DATADIR}/aclocal/* ${B}/aclocal-copy/
+ # for scratch build this directory can be empty
+ # so avoid cp's no files to copy error
+ cp -r ${STAGING_DATADIR}/aclocal/. ${B}/aclocal-copy/
acpaths="$acpaths -I ${B}/aclocal-copy/"
fi
# autoreconf is too shy to overwrite aclocal.m4 if it doesn't look