summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2016-08-30 16:19:58 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-03 09:58:39 +0100
commit8dcb8da9e31ae74342cc00edd447311334e28c20 (patch)
tree9e50c17aad0db92999193ad28d8ad5c503600b59 /meta/classes
parentf7d80257afcfefdc85b6745328f2d12b957a848b (diff)
downloadpoky-8dcb8da9e31ae74342cc00edd447311334e28c20.tar.gz
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>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/autotools.bbclass2
-rw-r--r--meta/classes/base.bbclass6
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(){
131 131
132EXTRACONFFUNCS ??= "" 132EXTRACONFFUNCS ??= ""
133 133
134EXTRA_OECONF_append = " ${PACKAGECONFIG_CONFARGS}"
135
134do_configure[prefuncs] += "autotools_preconfigure autotools_copy_aclocals ${EXTRACONFFUNCS}" 136do_configure[prefuncs] += "autotools_preconfigure autotools_copy_aclocals ${EXTRACONFFUNCS}"
135do_configure[postfuncs] += "autotools_postconfigure" 137do_configure[postfuncs] += "autotools_postconfigure"
136 138
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 () {
431 appendVar('RDEPENDS_${PN}', extrardeps) 431 appendVar('RDEPENDS_${PN}', extrardeps)
432 appendVar('PACKAGECONFIG_CONFARGS', extraconf) 432 appendVar('PACKAGECONFIG_CONFARGS', extraconf)
433 433
434 # TODO: once all recipes/classes abusing EXTRA_OECONF
435 # to get PACKAGECONFIG options are fixed to use PACKAGECONFIG_CONFARGS
436 # move this appendVar to autotools.bbclass.
437 if not bb.data.inherits_class('cmake', d):
438 appendVar('EXTRA_OECONF', extraconf)
439
440 pn = d.getVar('PN', True) 434 pn = d.getVar('PN', True)
441 license = d.getVar('LICENSE', True) 435 license = d.getVar('LICENSE', True)
442 if license == "INVALID": 436 if license == "INVALID":