mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 12:29:55 +00:00
Code Issues Projects Releases Wiki Activity

autotools: move aclocal-copy to WORKDIR

Browse Source 
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.

(From OE-Core rev: d7249c5cce6fbc7875c46f2452ca8cd045773898)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2016-08-05 16:17:09 +01:00
committed by Richard Purdie
parent e1081f491c
commit 63cb0eec1f
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/autotools.bbclass
+3 -5
View File
@@ -134,7 +134,7 @@ EXTRACONFFUNCS ??= ""
do_configure[prefuncs] += "autotools_preconfigure autotools_copy_aclocals ${EXTRACONFFUNCS}" do_configure[prefuncs] += "autotools_preconfigure autotools_copy_aclocals ${EXTRACONFFUNCS}"
do_configure[postfuncs] += "autotools_postconfigure" do_configure[postfuncs] += "autotools_postconfigure"
ACLOCALDIR = "${B}/aclocal-copy" ACLOCALDIR = "${WORKDIR}/aclocal-copy"
python autotools_copy_aclocals () { python autotools_copy_aclocals () {
s = d.getVar("AUTOTOOLS_SCRIPT_PATH", True) s = d.getVar("AUTOTOOLS_SCRIPT_PATH", True)
@@ -248,7 +248,7 @@ autotools_do_configure() {
if [ x"${acpaths}" = xdefault ]; then if [ x"${acpaths}" = xdefault ]; then
acpaths= acpaths=
for i in `find ${AUTOTOOLS_SCRIPT_PATH} -ignore_readdir_race -maxdepth 2 -name \*.m4|grep -v 'aclocal.m4'| \ 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" acpaths="$acpaths -I $i"
done done
else else
@@ -288,9 +288,7 @@ autotools_do_configure() {
fi fi
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 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 find ${S} -ignore_readdir_race -name $i -delete
rm $j
done
done done
fi fi
mkdir -p m4 mkdir -p m4