aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2019-05-23 13:33:34 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2019-05-23 13:38:43 +0000
commitb73f083d88d0bc0e3003e34b17913862b2077d7e (patch)
tree77b070f0c17ef5749f43ca1fcb31e525180453b1
parent08dd70333b06e5619067db083b6feca934559307 (diff)
downloadopenembedded-core-contrib-jansa/master.tar.gz
openembedded-core-contrib-jansa/master.tar.bz2
openembedded-core-contrib-jansa/master.zip
autotools, cmake, meson, waf: define PACKAGECONFIG_CONFARGS before appending itjansa/master
* just to make sure it's expaned by bitbake before it gets executed in shell * e.g. with cmake.bbclass and cmake recipe (any recipe without PACKAGECONFIG options have this issue) it looks like this: bitbake -e cmake | grep EXTRA_OECMAKE= EXTRA_OECMAKE=" -DCMAKE_DOC_DIR=share/doc/cmake-3.14 -DCMAKE_USE_SYSTEM_LIBRARIES=1 -DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=0 -DCMAKE_USE_SYSTEM_LIBRARY_LIBUV=0 -DCMAKE_USE_SYSTEM_LIBRARY_LIBRHASH=0 -DKWSYS_CHAR_IS_SIGNED=1 -DBUILD_CursesDialog=0 -DKWSYS_LFS_WORKS=1 \${PACKAGECONFIG_CONFARGS}" * there are some other places where PACKAGECONFIG_CONFARGS is used, but looks like all of them started to use it only after adding PACKAGECONFIG options in the recipe Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta/classes/autotools.bbclass1
-rw-r--r--meta/classes/cmake.bbclass1
-rw-r--r--meta/classes/meson.bbclass1
-rw-r--r--meta/classes/waf.bbclass1
4 files changed, 4 insertions, 0 deletions
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index 8768a6ad68..32961320a5 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -129,6 +129,7 @@ autotools_postconfigure(){
EXTRACONFFUNCS ??= ""
+PACKAGECONFIG_CONFARGS ??= ""
EXTRA_OECONF_append = " ${PACKAGECONFIG_CONFARGS}"
do_configure[prefuncs] += "autotools_preconfigure autotools_aclocals ${EXTRACONFFUNCS}"
diff --git a/meta/classes/cmake.bbclass b/meta/classes/cmake.bbclass
index d3f0d70847..b5deb7da70 100644
--- a/meta/classes/cmake.bbclass
+++ b/meta/classes/cmake.bbclass
@@ -56,6 +56,7 @@ OECMAKE_EXTRA_ROOT_PATH ?= ""
OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM = "ONLY"
OECMAKE_FIND_ROOT_PATH_MODE_PROGRAM_class-native = "BOTH"
+PACKAGECONFIG_CONFARGS ??= ""
EXTRA_OECMAKE_append = " ${PACKAGECONFIG_CONFARGS}"
EXTRA_OECMAKE_BUILD_prepend_task-compile = "${PARALLEL_MAKE} "
diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass
index 115d1aedcb..4f03a51e09 100644
--- a/meta/classes/meson.bbclass
+++ b/meta/classes/meson.bbclass
@@ -35,6 +35,7 @@ MESON_C_ARGS = "${MESON_TOOLCHAIN_ARGS} ${CFLAGS}"
MESON_CPP_ARGS = "${MESON_TOOLCHAIN_ARGS} ${CXXFLAGS}"
MESON_LINK_ARGS = "${MESON_TOOLCHAIN_ARGS} ${LDFLAGS}"
+PACKAGECONFIG_CONFARGS ??= ""
EXTRA_OEMESON_append = " ${PACKAGECONFIG_CONFARGS}"
MESON_CROSS_FILE = ""
diff --git a/meta/classes/waf.bbclass b/meta/classes/waf.bbclass
index 900244004e..f7178b28e9 100644
--- a/meta/classes/waf.bbclass
+++ b/meta/classes/waf.bbclass
@@ -3,6 +3,7 @@ DISABLE_STATIC = ""
B = "${WORKDIR}/build"
+PACKAGECONFIG_CONFARGS ??= ""
EXTRA_OECONF_append = " ${PACKAGECONFIG_CONFARGS}"
def waflock_hash(d):