All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] autotools, cmake, meson, waf: define PACKAGECONFIG_CONFARGS before appending it
@ 2019-05-23 13:55 Martin Jansa
  2019-05-23 14:20 ` Burton, Ross
  0 siblings, 1 reply; 3+ messages in thread
From: Martin Jansa @ 2019-05-23 13:55 UTC (permalink / raw)
  To: openembedded-core

* 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



^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH] autotools, cmake, meson, waf: define PACKAGECONFIG_CONFARGS before appending it
  2019-05-23 13:55 [PATCH] autotools, cmake, meson, waf: define PACKAGECONFIG_CONFARGS before appending it Martin Jansa
@ 2019-05-23 14:20 ` Burton, Ross
  2019-06-18 11:41   ` [PATCHv2] base.bbclass: define PACKAGECONFIG_CONFARGS before only sometimes appending to it Martin Jansa
  0 siblings, 1 reply; 3+ messages in thread
From: Burton, Ross @ 2019-05-23 14:20 UTC (permalink / raw)
  To: Martin Jansa; +Cc: OE-core

I think a neater solution might be to just aways set that when
handling PACKAGECONFIG in base.bbclass.  Presumably the problem here
is that if PACKAGECONFIG isn't set then PACKAGECONFIG_CONFARGS is
never set, so lets ensure it is always set.

Ross

On Thu, 23 May 2019 at 14:55, Martin Jansa <martin.jansa@gmail.com> wrote:
>
> * 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
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core


^ permalink raw reply	[flat|nested] 3+ messages in thread
* [PATCHv2] base.bbclass: define PACKAGECONFIG_CONFARGS before only sometimes appending to it
  2019-05-23 14:20 ` Burton, Ross
@ 2019-06-18 11:41   ` Martin Jansa
  0 siblings, 0 replies; 3+ messages in thread
From: Martin Jansa @ 2019-06-18 11:41 UTC (permalink / raw)
  To: openembedded-core

* 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}"

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/classes/base.bbclass | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 90af8ba72b..0c8a4b2862 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -15,6 +15,8 @@ OE_EXTRA_IMPORTS ?= ""
 OE_IMPORTS += "os sys time oe.path oe.utils oe.types oe.package oe.packagegroup oe.sstatesig oe.lsb oe.cachedpath oe.license ${OE_EXTRA_IMPORTS}"
 OE_IMPORTS[type] = "list"
 
+PACKAGECONFIG_CONFARGS ??= ""
+
 def oe_import(d):
     import sys
 
-- 
2.17.1



^ permalink raw reply related	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-06-18 11:41 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-23 13:55 [PATCH] autotools, cmake, meson, waf: define PACKAGECONFIG_CONFARGS before appending it Martin Jansa
2019-05-23 14:20 ` Burton, Ross
2019-06-18 11:41   ` [PATCHv2] base.bbclass: define PACKAGECONFIG_CONFARGS before only sometimes appending to it Martin Jansa

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.