diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2016-04-19 12:31:40 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-04-19 21:11:24 +0100 |
commit | c2f7da23d07b10318e8d8bf68e3edd759d7823a3 (patch) | |
tree | a1ea0a5cf0c2ed13b95e84428e91765f27eec1be /meta/classes/cmake.bbclass | |
parent | e1c6890cfe1a0ff08b342e1765a48be1fdbad026 (diff) | |
download | poky-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/classes/cmake.bbclass')
-rw-r--r-- | meta/classes/cmake.bbclass | 2 |
1 files changed, 2 insertions, 0 deletions
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 ?= "" | |||
27 | OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "ONLY" | 27 | OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "ONLY" |
28 | OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM_class-native = "BOTH" | 28 | OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM_class-native = "BOTH" |
29 | 29 | ||
30 | EXTRA_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. |