summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-23 13:05:09 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-02-24 00:12:02 +0000
commit95eb87b7f662f9faabaccea8dca534b1487c8cac (patch)
tree561380093fc98adbb5a686f543d2e632663d3303 /meta
parent6ad11cba63e3dae8a3eedd1fadc62f210c6488cb (diff)
downloadpoky-95eb87b7f662f9faabaccea8dca534b1487c8cac.tar.gz
autotools.bbclass: Make builds deterministic
We need to ensure any aclocal-copy directory is removed before we s earch for .m4 files, else the locations .m4 files are found from can vary depending on whether its the first or second time we run configure. Clearing any existing aclocal-copy directory before we start resolves this issue and makes builds deterministic again. (From OE-Core rev: 673e2a05013cbe08efde936f663845031025689d) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/autotools.bbclass2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index e22ea6837f..a8d2b5f32e 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -102,6 +102,8 @@ autotools_do_configure() {
102 if [ -e ${S}/configure.in -o -e ${S}/configure.ac ]; then 102 if [ -e ${S}/configure.in -o -e ${S}/configure.ac ]; then
103 olddir=`pwd` 103 olddir=`pwd`
104 cd ${S} 104 cd ${S}
105 # Remove any previous copy of the m4 macros
106 rm -rf ${B}/aclocal-copy/
105 if [ x"${acpaths}" = xdefault ]; then 107 if [ x"${acpaths}" = xdefault ]; then
106 acpaths= 108 acpaths=
107 for i in `find ${S} -maxdepth 2 -name \*.m4|grep -v 'aclocal.m4'| \ 109 for i in `find ${S} -maxdepth 2 -name \*.m4|grep -v 'aclocal.m4'| \