From b33475730be59c50296dac05381914e11a927167 Mon Sep 17 00:00:00 2001 From: Nitin A Kamble Date: Wed, 28 Dec 2011 09:34:00 -0800 Subject: 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 (From OE-Core rev: f4ffe39450c3da33b24766a5f83ad06cc8ff950c) Signed-off-by: Nitin A Kamble Signed-off-by: Richard Purdie --- meta/classes/autotools.bbclass | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'meta/classes/autotools.bbclass') diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass index 7536bac396..2f462ff93b 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 -- cgit v1.2.3-54-g00ecf