diff options
| author | Martin Jansa <martin.jansa@gmail.com> | 2016-08-30 16:19:58 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-03 09:58:27 +0100 |
| commit | c98fb5f5129e71829ffab4449b3d28082bc95ab4 (patch) | |
| tree | 5c2634e8a060da2749a2b3e90ca5520d0369c293 | |
| parent | 30486429ed228e387ee574c6990b361d2ade6a32 (diff) | |
| download | openembedded-core-c98fb5f5129e71829ffab4449b3d28082bc95ab4.tar.gz openembedded-core-c98fb5f5129e71829ffab4449b3d28082bc95ab4.tar.bz2 openembedded-core-c98fb5f5129e71829ffab4449b3d28082bc95ab4.zip | |
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.
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/autotools.bbclass | 2 | ||||
| -rw-r--r-- | 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 076899cce1..47a01902d0 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 79edfe5451..a31a53fcb6 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": |