summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2016-04-19 12:31:40 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-19 21:11:24 +0100
commitc2f7da23d07b10318e8d8bf68e3edd759d7823a3 (patch)
treea1ea0a5cf0c2ed13b95e84428e91765f27eec1be /meta
parente1c6890cfe1a0ff08b342e1765a48be1fdbad026 (diff)
downloadpoky-c2f7da23d07b10318e8d8bf68e3edd759d7823a3.tar.gz
base.bbclass: Introduce PACKAGECONFIG_CONFARGS variable
* add separate variable for configuration options generated from PACKAGECONFIG setting, this helps other bbclasses and recipes to take advantage of PACKAGECONFIG mechanism, without including other options from EXTRA_OECONF * e.g. meta-qt5 recipes are abusing EXTRA_OECONF to get options from PACKAGECONFIG: EXTRA_QMAKEVARS_PRE += but with conf/distro/include/no-static-libs.inc it means getting --disable-static as invalid option inside EXTRA_QMAKEVARS_PRE as reported by Alexandre Belloni who tried to use poky with meta-qt5. * once we migrate all bbclasses and recipes to PACKAGECONFIG_CONFARGS we should also restrict EXTRA_OECONF append only to autotools.bbclass like I did for cmake.bbclass (From OE-Core rev: 0ea4a47bfc27d02594d489b27c029d3d3badf3d4) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/base.bbclass9
-rw-r--r--meta/classes/cmake.bbclass2
2 files changed, 8 insertions, 3 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index f9697a9ad8..a7ca3a6676 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -428,9 +428,12 @@ python () {
428 extraconf.append(items[1]) 428 extraconf.append(items[1])
429 appendVar('DEPENDS', extradeps) 429 appendVar('DEPENDS', extradeps)
430 appendVar('RDEPENDS_${PN}', extrardeps) 430 appendVar('RDEPENDS_${PN}', extrardeps)
431 if bb.data.inherits_class('cmake', d): 431 appendVar('PACKAGECONFIG_CONFARGS', extraconf)
432 appendVar('EXTRA_OECMAKE', extraconf) 432
433 else: 433 # TODO: once all recipes/classes abusing EXTRA_OECONF
434 # to get PACKAGECONFIG options are fixed to use PACKAGECONFIG_CONFARGS
435 # move this appendVar to autotools.bbclass.
436 if not bb.data.inherits_class('cmake', d):
434 appendVar('EXTRA_OECONF', extraconf) 437 appendVar('EXTRA_OECONF', extraconf)
435 438
436 pn = d.getVar('PN', True) 439 pn = d.getVar('PN', True)
diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
index 22cd61eb06..02f313a861 100644
--- a/meta/classes/cmake.bbclass
+++ b/meta/classes/cmake.bbclass
@@ -27,6 +27,8 @@ OECMAKE_EXTRA_ROOT_PATH ?= ""
27OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "ONLY" 27OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "ONLY"
28OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM_class-native = "BOTH" 28OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM_class-native = "BOTH"
29 29
30EXTRA_OECMAKE_append = " ${PACKAGECONFIG_CONFARGS}"
31
30# CMake expects target architectures in the format of uname(2), 32# CMake expects target architectures in the format of uname(2),
31# which do not always match TARGET_ARCH, so all the necessary 33# which do not always match TARGET_ARCH, so all the necessary
32# conversions should happen here. 34# conversions should happen here.