Patchwork [CONSOLIDATED,PULL,074/113] autotools.bbclass: fix cp error for empty dir

login
register
mail settings
Submitter Saul Wold
Date Jan. 3, 2012, 6:20 a.m.
Message ID <69b990e7c7276b28e2e9434681a8849f6a4a9904.1325571069.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/18145/
State New
Headers show

Comments

Saul Wold - Jan. 3, 2012, 6:20 a.m.
From: Nitin A Kamble <nitin.a.kamble@intel.com>

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>
---
 meta/classes/autotools.bbclass |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

Patch

diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index 7536bac..2f462ff 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