aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2018-09-23 15:38:17 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2018-09-25 22:24:46 +0200
commitd1d2d0ac63cc1305a0c8264fd3f8c7605a8aeb8a (patch)
treed3d65979019994a26222d7fa7f297412d735afbe
parent81dddf29821cf1f7d90b96ad0739116f5c3bf1eb (diff)
downloadbuildroot-d1d2d0ac63cc1305a0c8264fd3f8c7605a8aeb8a.tar.gz
buildroot-d1d2d0ac63cc1305a0c8264fd3f8c7605a8aeb8a.tar.bz2
package/pkg-waf: properly escape HOST_DIR when defining <pkg>_WAF
When <pkg>_NEEDS_EXTERNAL_WAF is set to YES, <pkg>_WAF is set to $(HOST_DIR)/bin/waf within the inner-waf-package macro. This reference to $(HOST_DIR) should use $$(HOST_DIR) so that it is properly expanded at the time of use, and not at the time of the macro expansion. In the current Buildroot, this doesn't cause any visible problem because $(HOST_DIR) points to the same directory for all packages. However, with per-package host/target directories, this is no longer the case. It causes a build issue because it tries to use "waf" from the global host directory, which doesn't exist during the build. This commit fixes the following build issue with per package host/target directories: /home/test/autobuild/run/instance-2/output/per-package/mpv/host/bin/python2: can't open file '/home/test/autobuild/run/instance-2/output/host/bin/waf': [Errno 2] No such file or directory make: *** [/home/test/autobuild/run/instance-2/output/build/mpv-0.27.2/.stamp_configured] Error 2 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-rw-r--r--package/pkg-waf.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk
index e5b606f063..3288dd63a0 100644
--- a/package/pkg-waf.mk
+++ b/package/pkg-waf.mk
@@ -44,7 +44,7 @@ $(2)_NEEDS_EXTERNAL_WAF ?= NO
# If the package does not have its own waf, use our own.
ifeq ($$($(2)_NEEDS_EXTERNAL_WAF),YES)
$(2)_DEPENDENCIES += host-waf
-$(2)_WAF = $(HOST_DIR)/bin/waf
+$(2)_WAF = $$(HOST_DIR)/bin/waf
else
$(2)_WAF = ./waf
endif