Skip to contentSkip to conversation

package/pkg-waf: properly escape HOST_DIR when defining <pkg>_WAF

PATCH New Thomas Petazzoni 2 participants 3 messages Sep 23, 2018 – Sep 25, 2018

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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

---
 package/pkg-waf.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/pkg-waf.mk +1 -1
index e5b606f063..3288dd63a0 100644
@@ -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
Signature · 1 line
2.14.4
#1 lore raw

PATCH 1/1 package/pkg-waf: properly escape HOST_DIR when defining <pkg>_WAF

Thomas, All,

On 2018-09-23 15:38 +0200, Thomas Petazzoni spake thusly:

Quoted 12 lines

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.

Quoted 7 lines

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

Regards,
Yann E. MORIN.

Quoted 20 lines
---
 package/pkg-waf.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/pkg-waf.mk +1 -1
index e5b606f063..3288dd63a0 100644
@@ -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
Signature · 1 line
2.14.4
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
author Applied
#2 lore raw

PATCH 1/1 package/pkg-waf: properly escape HOST_DIR when defining <pkg>_WAF

In reply to Thomas Petazzoni

Hello,

Quoted 15 lines · Thomas Petazzoni

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:

Quoted 7 lines

/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

---
 package/pkg-waf.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com