Openembedded Core Discussions
 help / color / mirror / Atom feed
* [PATCH] classes/waf: Fix builds when B != S
@ 2018-11-30 21:55 Joshua Watt
  2018-11-30 23:00 ` Burton, Ross
  2018-12-01  3:01 ` [PATCH v2] " Joshua Watt
  0 siblings, 2 replies; 11+ messages in thread
From: Joshua Watt @ 2018-11-30 21:55 UTC (permalink / raw)
  To: openembedded-core

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@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..9cb5b68f449 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}/${BPN}-${PV}"
+
 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
-- 
2.19.1



^ permalink raw reply related	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2018-12-03 23:18 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-30 21:55 [PATCH] classes/waf: Fix builds when B != S Joshua Watt
2018-11-30 23:00 ` Burton, Ross
2018-12-01  0:01   ` Joshua Watt
2018-12-01  0:30     ` Joshua Watt
2018-12-01  3:01 ` [PATCH v2] " Joshua Watt
2018-12-02  0:09   ` Khem Raj
2018-12-03 20:14     ` Khem Raj
2018-12-03 21:50       ` Andreas Müller
2018-12-03 22:04         ` Khem Raj
2018-12-03 22:22         ` Joshua Watt
2018-12-03 23:18           ` Andreas Müller

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox