[gnome-continuous-yocto/gnomeostree-3.28-rocko: 2168/8267] base, autotools: Append PACKAGECONFIG_CONFARGS to EXTRA_OECONF only in autotools.bbclass

[Emmanuele Bassi <ebassi src gnome org>]

commit 8dcb8da9e31ae74342cc00edd447311334e28c20
Author: Martin Jansa <martin jansa gmail com>
Date:   Tue Aug 30 16:19:58 2016 +0200

    base, autotools: Append PACKAGECONFIG_CONFARGS to EXTRA_OECONF only in autotools.bbclass
    
    * recipes which don't inherit autotools or cmake bbclass and want to
      use the configure options from PACKAGECONFIG need to handle
      PACKAGECONFIG_CONFARGS themselves.
    
    (From OE-Core rev: c98fb5f5129e71829ffab4449b3d28082bc95ab4)
    
    Signed-off-by: Martin Jansa <Martin Jansa gmail com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/autotools.bbclass |    2 ++
 meta/classes/base.bbclass      |    6 ------
 2 files changed, 2 insertions(+), 6 deletions(-)
---
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index 076899c..47a0190 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -131,6 +131,8 @@ autotools_postconfigure(){
 
 EXTRACONFFUNCS ??= ""
 
+EXTRA_OECONF_append = " ${PACKAGECONFIG_CONFARGS}"
+
 do_configure[prefuncs] += "autotools_preconfigure autotools_copy_aclocals ${EXTRACONFFUNCS}"
 do_configure[postfuncs] += "autotools_postconfigure"
 
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 79edfe5..a31a53f 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -431,12 +431,6 @@ python () {
         appendVar('RDEPENDS_${PN}', extrardeps)
         appendVar('PACKAGECONFIG_CONFARGS', extraconf)
 
-        # TODO: once all recipes/classes abusing EXTRA_OECONF
-        # to get PACKAGECONFIG options are fixed to use PACKAGECONFIG_CONFARGS
-        # move this appendVar to autotools.bbclass.
-        if not bb.data.inherits_class('cmake', d):
-            appendVar('EXTRA_OECONF', extraconf)
-
     pn = d.getVar('PN', True)
     license = d.getVar('LICENSE', True)
     if license == "INVALID":