classes/waf: Add build and install arguments
PATCH 1/1 classes/waf: Add build and install arguments
Adds variables that can be used to allow a recipe to pass extra arguments to waf build and waf install. In most cases, you want to pass the same arguments to build and install (since install is a superset of build), so by default setting EXTRA_OEWAF_BUILD also affects waf install, but this can be overridded.
--- meta/classes/waf.bbclass | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
meta/classes/waf.bbclass +7 -2
@@ -5,6 +5,11 @@ B = "${WORKDIR}/build" EXTRA_OECONF_append = " ${PACKAGECONFIG_CONFARGS}" +EXTRA_OEWAF_BUILD ??= "" +# In most cases, you want to pass the same arguments to `waf build` and `waf +# install`, but you can override it if necessary +EXTRA_OEWAF_INSTALL ??= "${EXTRA_OEWAF_BUILD}" + def waflock_hash(d): # Calculates the hash used for the waf lock file. This should include # all of the user controllable inputs passed to waf configure. Note
@@ -55,11 +60,11 @@ waf_do_configure() { do_compile[progress] = "outof:^\[\s*(\d+)/\s*(\d+)\]\s+" waf_do_compile() { - (cd ${S} && ./waf build ${@oe.utils.parallel_make_argument(d, '-j%d', limit=64)}) + (cd ${S} && ./waf build ${@oe.utils.parallel_make_argument(d, '-j%d', limit=64)} ${EXTRA_OEWAF_BUILD}) } waf_do_install() { - (cd ${S} && ./waf install --destdir=${D}) + (cd ${S} && ./waf install --destdir=${D} ${EXTRA_OEWAF_INSTALL}) } EXPORT_FUNCTIONS do_configure do_compile do_install
Signature · 1 line
2.28.0
Quoted 7 lines · Joshua Watt
Adds variables that can be used to allow a recipe to pass extra arguments to
waf buildandwaf install. In most cases, you want to pass the same arguments tobuildandinstall(since install is a superset ofbuild), so by default settingEXTRA_OEWAF_BUILDalso affectswaf install, but this can be overridded.
I wonder if it should be called EXTRA_OEWAF to match other component build systems naming convention
secondly, it should be added to documentation as well
Quoted 41 lines
Signed-off-by Joshua Watt <[email protected]>--- meta/classes/waf.bbclass | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)meta/classes/waf.bbclass +7
-3@@ -5,6 +5,11 @@ B = "${WORKDIR}/build" EXTRA_OECONF_append = " ${PACKAGECONFIG_CONFARGS}" +EXTRA_OEWAF_BUILD ??= "" +# In most cases, you want to pass the same arguments to `waf build` and `waf +# install`, but you can override it if necessary +EXTRA_OEWAF_INSTALL ??= "${EXTRA_OEWAF_BUILD}" + def waflock_hash(d): # Calculates the hash used for the waf lock file. This should include # all of the user controllable inputs passed to waf configure. Note@@ -55,11 +60,11 @@ waf_do_configure() { do_compile[progress] = "outof:^\[\s*(\d+)/\s*(\d+)\]\s+" waf_do_compile() { - (cd ${S} && ./waf build ${@oe.utils.parallel_make_argument(d, '-j%d', limit=64)}) + (cd ${S} && ./waf build ${@oe.utils.parallel_make_argument(d, '-j%d', limit=64)} ${EXTRA_OEWAF_BUILD}) } waf_do_install() { - (cd ${S} && ./waf install --destdir=${D}) + (cd ${S} && ./waf install --destdir=${D} ${EXTRA_OEWAF_INSTALL}) } EXPORT_FUNCTIONS do_configure do_compile do_install --2.28.0