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>

diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index 1f3c771c69697cb67e05394ab46b29b059f7c0e8..70804b82b4dac244ffb1935ff381193ae4dfd1cb 100644 (file)
--- 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"