[oe-commits] [openembedded-core] 07/15: autotools: move aclocal-copy to WORKDIR

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit d7249c5cce6fbc7875c46f2452ca8cd045773898
Author: Ross Burton <ross.burton at intel.com>
AuthorDate: Fri Aug 5 16:17:09 2016 +0100

    autotools: move aclocal-copy to WORKDIR
    
    To save time move the temporary copy of the autoconf macros, aclocal-copy, from
    ${B} to ${WORKDIR}.  This ensures that it can't conflict with anything in ${S}
    and means the pruning code doesn't need to know about it.
    
    Signed-off-by: Ross Burton <ross.burton at intel.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/classes/autotools.bbclass | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index 1c884b4..22359d3 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -134,7 +134,7 @@ EXTRACONFFUNCS ??= ""
 do_configure[prefuncs] += "autotools_preconfigure autotools_copy_aclocals ${EXTRACONFFUNCS}"
 do_configure[postfuncs] += "autotools_postconfigure"
 
-ACLOCALDIR = "${B}/aclocal-copy"
+ACLOCALDIR = "${WORKDIR}/aclocal-copy"
 
 python autotools_copy_aclocals () {
     s = d.getVar("AUTOTOOLS_SCRIPT_PATH", True)
@@ -248,7 +248,7 @@ autotools_do_configure() {
 		if [ x"${acpaths}" = xdefault ]; then
 			acpaths=
 			for i in `find ${AUTOTOOLS_SCRIPT_PATH} -ignore_readdir_race -maxdepth 2 -name \*.m4|grep -v 'aclocal.m4'| \
-				grep -v 'acinclude.m4' | grep -v 'aclocal-copy' | sed -e 's,\(.*/\).*$,\1,'|sort -u`; do
+				grep -v 'acinclude.m4' | sed -e 's,\(.*/\).*$,\1,'|sort -u`; do
 				acpaths="$acpaths -I $i"
 			done
 		else
@@ -288,9 +288,7 @@ autotools_do_configure() {
 				fi
 			fi
 			for i in gettext.m4 iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4 po.m4 progtest.m4; do
-				for j in `find ${S} -ignore_readdir_race -name $i | grep -v aclocal-copy`; do
-					rm $j
-				done
+				find ${S} -ignore_readdir_race -name $i -delete
 			done
 		fi
 		mkdir -p m4

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.