autotools, cmake, meson, waf: define PACKAGECONFIG_CONFARGS before appending it
PATCH 1/1 autotools, cmake, meson, waf: define PACKAGECONFIG_CONFARGS before appending it
* 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
--- 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(+)
meta/classes/autotools.bbclass +1 -0
@@ -129,6 +129,7 @@ autotools_postconfigure(){ EXTRACONFFUNCS ??= "" +PACKAGECONFIG_CONFARGS ??= "" EXTRA_OECONF_append = " ${PACKAGECONFIG_CONFARGS}" do_configure[prefuncs] += "autotools_preconfigure autotools_aclocals ${EXTRACONFFUNCS}"
meta/classes/cmake.bbclass +1 -0
@@ -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} "
meta/classes/meson.bbclass +1 -0
@@ -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 = ""
meta/classes/waf.bbclass +1 -0
@@ -3,6 +3,7 @@ DISABLE_STATIC = "" B = "${WORKDIR}/build" +PACKAGECONFIG_CONFARGS ??= "" EXTRA_OECONF_append = " ${PACKAGECONFIG_CONFARGS}" def waflock_hash(d):
Signature · 1 line
2.17.1
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
Quoted 80 lines · Martin Jansa
* 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_CONFARGSis used, but looks like all of them started to use it only after adding PACKAGECONFIG options in the recipeSigned-off-by Martin Jansa <[email protected]>--- 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(+)meta/classes/autotools.bbclass +1
-0@@ -129,6 +129,7 @@ autotools_postconfigure(){ EXTRACONFFUNCS ??= "" +PACKAGECONFIG_CONFARGS ??= "" EXTRA_OECONF_append = " ${PACKAGECONFIG_CONFARGS}" do_configure[prefuncs] += "autotools_preconfigure autotools_aclocals ${EXTRACONFFUNCS}"meta/classes/cmake.bbclass +1
-0@@ -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} "meta/classes/meson.bbclass +1
-0@@ -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 = ""meta/classes/waf.bbclass +1
-1@@ -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
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
PATCH v2 1/1 base.bbclass: define PACKAGECONFIG_CONFARGS before only sometimes appending to it
* 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}"--- meta/classes/base.bbclass | 2 ++ 1 file changed, 2 insertions(+)
meta/classes/base.bbclass +2 -0
@@ -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
Signature · 1 line
2.17.1