diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-11 15:22:29 +0100 |
|---|---|---|
| committer |   Andreas Oberritter <obi@opendreambox.org> | 2014-03-10 20:37:58 +0100 |
| commit | 234adb630e407520110b8a8e06dc8f2a302cd491 (patch) | |
| tree | 2a951b0345c45d97e9b0febb5378856029fcb3ca | |
| parent | 010e9fafe9745a9b1fb42abd642ba16e4c79e0ee (diff) | |
| download | openembedded-core-contrib-234adb630e407520110b8a8e06dc8f2a302cd491.tar.gz | |
autotools.bbclass: Add functionality to force a clean of ${B} when reconfiguring (and ${S} != ${B})
Unfortunately whilst rerunning configure and make against a project will mostly
work there are situations where it does not correctly do the right thing.
In particular, eglibc and gcc will fail out with errors where settings
do not match a previously built configuration. It could be argued they are
broken but the situation is what it is. There is the possibility of more subtle
errors too.
This patch adds removal of the build directory (${B}) when configure is
rerunning, the sstate checksum for do_configure has changed and ${S} != ${B}.
We could simply use a stamp but saving out the previous configuration checksum
adds some data at no real overhead.
If we find there are things where we want to disable this behaviour with
CONFIGURESTAMPFILE = "" in the recipe, or users could disable it globally.
[YOCTO #2774]
[YOCTO #2848]
This is particularly helpful for eglibc and gcc which use split builds by default and
are a particular source of reconfigure type problems.
(From OE-Core rev: f15f61af77cc4e52a037f509f8e49e1ea530cf35)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 14fc04e480aaf1cb5cd9d3a04a5b38d2fda115b1)
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
| -rw-r--r-- | meta/classes/autotools.bbclass | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass index 941c06d032..141b2eea94 100644 --- a/meta/classes/autotools.bbclass +++ b/meta/classes/autotools.bbclass @@ -82,6 +82,27 @@ oe_runconf () { AUTOTOOLS_AUXDIR ?= "${S}" +CONFIGURESTAMPFILE = "${WORKDIR}/configure.sstate" + +autotools_preconfigure() { + if [ -n "${CONFIGURESTAMPFILE}" -a -e "${CONFIGURESTAMPFILE}" ]; then + if [ "`cat ${CONFIGURESTAMPFILE}`" != "${BB_TASKHASH}" -a "${S}" != "${B}" ]; then + echo "Previously configured separate build directory detected, cleaning ${B}" + rm -rf ${B} + mkdir ${B} + fi + fi +} + +autotools_postconfigure(){ + if [ -n "${CONFIGURESTAMPFILE}" ]; then + echo ${BB_TASKHASH} > ${CONFIGURESTAMPFILE} + fi +} + +do_configure[prefuncs] += "autotools_preconfigure" +do_configure[postfuncs] += "autotools_postconfigure" + autotools_do_configure() { case ${PN} in autoconf*) |