From: Martin Jansa <martin.jansa@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH] autotools, cmake, meson, waf: define PACKAGECONFIG_CONFARGS before appending it
Date: Thu, 23 May 2019 13:55:14 +0000 [thread overview]
Message-ID: <20190523135514.20622-1-Martin.Jansa@gmail.com> (raw)
* 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>
---
meta/classes/autotools.bbclass | 1 +
meta/classes/cmake.bbclass | 1 +
meta/classes/meson.bbclass | 1 +
meta/classes/waf.bbclass | 1 +
4 files changed, 4 insertions(+)
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):
--
2.17.1
next reply other threads:[~2019-05-23 13:55 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-23 13:55 Martin Jansa [this message]
2019-05-23 14:20 ` [PATCH] autotools, cmake, meson, waf: define PACKAGECONFIG_CONFARGS before appending it Burton, Ross
2019-06-18 11:41 ` [PATCHv2] base.bbclass: define PACKAGECONFIG_CONFARGS before only sometimes appending to it Martin Jansa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190523135514.20622-1-Martin.Jansa@gmail.com \
--to=martin.jansa@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox