MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 21:09:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

base, autotools: Append PACKAGECONFIG_CONFARGS to EXTRA_OECONF only in autotools.bbclass

Browse Source 
* 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>
This commit is contained in:
Martin Jansa 2016-08-30 16:19:58 +02:00 committed by Richard Purdie
parent f7d80257af
commit 8dcb8da9e3
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta/classes/autotools.bbclass
View File

@ -131,6 +131,8 @@ autotools_postconfigure(){
EXTRACONFFUNCS ??= "" EXTRACONFFUNCS ??= ""
EXTRA_OECONF_append = " ${PACKAGECONFIG_CONFARGS}"
do_configure[prefuncs] += "autotools_preconfigure autotools_copy_aclocals ${EXTRACONFFUNCS}" do_configure[prefuncs] += "autotools_preconfigure autotools_copy_aclocals ${EXTRACONFFUNCS}"
do_configure[postfuncs] += "autotools_postconfigure" do_configure[postfuncs] += "autotools_postconfigure"

6
meta/classes/base.bbclass
View File

@ -431,12 +431,6 @@ python () {
appendVar('RDEPENDS_${PN}', extrardeps) appendVar('RDEPENDS_${PN}', extrardeps)
appendVar('PACKAGECONFIG_CONFARGS', extraconf) 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) pn = d.getVar('PN', True)
license = d.getVar('LICENSE', True) license = d.getVar('LICENSE', True)
if license == "INVALID": if license == "INVALID":