[OE-core] [PATCH v2] classes/waf: Fix builds when B != S
Khem Raj
raj.khem at gmail.com
Sun Dec 2 00:09:44 UTC 2018
Hi Joshua
There is a build failure for a2jmidid see
http://errors.yoctoproject.org/Errors/Details/202833/
Seem to be related can you validate
On 11/30/18 7:01 PM, Joshua Watt wrote:
> Waf requires that the current working directory be ${S} (the location of
> the wscript) when building. Most of the time, this was true only because
> B defaults to S. However, anything that changed that behavior (notably,
> using externalsrc) would break the recipe. Remedy this by explicitly
> changing cwd to ${S} when running waf commands. As a happy side effect,
> B can be set up for "out of tree" builds to keep the source directory
> clean.
>
> Signed-off-by: Joshua Watt <JPEWhacker at gmail.com>
> ---
> meta/classes/waf.bbclass | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/meta/classes/waf.bbclass b/meta/classes/waf.bbclass
> index 19e93761b39..8e6d754c299 100644
> --- a/meta/classes/waf.bbclass
> +++ b/meta/classes/waf.bbclass
> @@ -1,6 +1,8 @@
> # avoids build breaks when using no-static-libs.inc
> DISABLE_STATIC = ""
>
> +B = "${WORKDIR}/build"
> +
> EXTRA_OECONF_append = " ${PACKAGECONFIG_CONFARGS}"
>
> python waf_preconfigure() {
> @@ -22,16 +24,16 @@ python waf_preconfigure() {
> do_configure[prefuncs] += "waf_preconfigure"
>
> waf_do_configure() {
> - ${S}/waf configure --prefix=${prefix} ${WAF_EXTRA_CONF} ${EXTRA_OECONF}
> + (cd ${S} && ./waf configure -o ${B} --prefix=${prefix} ${WAF_EXTRA_CONF} ${EXTRA_OECONF})
> }
>
> do_compile[progress] = "outof:^\[\s*(\d+)/\s*(\d+)\]\s+"
> waf_do_compile() {
> - ${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)})
> }
>
> waf_do_install() {
> - ${S}/waf install --destdir=${D}
> + (cd ${S} && ./waf install --destdir=${D})
> }
>
> EXPORT_FUNCTIONS do_configure do_compile do_install
>
More information about the Openembedded-core
mailing list