diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2020-10-14 22:36:45 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-10-17 12:33:30 +0100 |
| commit | 14c3454db0108ff78b73eecfae179a69241d9f5c (patch) | |
| tree | 473092e2c4548bb7e52cfe67cccc3d676a38cc24 | |
| parent | 1a566f1685258bdd6da50c8d2183ff21bed41bb3 (diff) | |
| download | openembedded-core-14c3454db0108ff78b73eecfae179a69241d9f5c.tar.gz | |
autotools.bbclass: Order CONFIG_SHELL before CACHED_CONFIGUREVARS
This helps in overriding CACHED_CONFIGUREVARS with wrappers to run
configure under e.g. for static analysers like scan-build from clang,
while it should not change the functionality in normal case.
Since CONFIG_SHELL was introduced, it silently broke this use case and
failed running static analyser on autotool based recipes
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/autotools.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass index 1f3c771c69..70804b82b4 100644 --- a/meta/classes/autotools.bbclass +++ b/meta/classes/autotools.bbclass @@ -90,7 +90,7 @@ oe_runconf () { cfgscript=`python3 -c "import os; print(os.path.relpath(os.path.dirname('${CONFIGURE_SCRIPT}'), '.'))"`/$cfgscript_name if [ -x "$cfgscript" ] ; then bbnote "Running $cfgscript ${CONFIGUREOPTS} ${EXTRA_OECONF} $@" - if ! ${CACHED_CONFIGUREVARS} CONFIG_SHELL=/bin/bash $cfgscript ${CONFIGUREOPTS} ${EXTRA_OECONF} "$@"; then + if ! CONFIG_SHELL=/bin/bash ${CACHED_CONFIGUREVARS} $cfgscript ${CONFIGUREOPTS} ${EXTRA_OECONF} "$@"; then bbnote "The following config.log files may provide further information." bbnote `find ${B} -ignore_readdir_race -type f -name config.log` bbfatal_log "configure failed" |