From d058c514c6f844a00ad61f82773c98c0c4fb6705 Mon Sep 17 00:00:00 2001 From: David GOUARIN Date: Tue, 5 Jul 2022 15:44:00 +0200 Subject: [PATCH] package/pkg-waf.mk: enable definiton of env. variables in every build steps It might be necessary for some packages to define environment variables when calling waf build and waf install. This is done the same way as the others package types, by defining $(PKG)_MAKE_ENV in .mk. Signed-off-by: David GOUARIN Signed-off-by: Yann E. MORIN (cherry picked from commit 95ea6664cdd552acbb366e8eb8393224df40e57f) Signed-off-by: Peter Korsgaard --- package/pkg-waf.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk index d546b4a817..e090afa9e6 100644 --- a/package/pkg-waf.mk +++ b/package/pkg-waf.mk @@ -75,7 +75,7 @@ endif ifndef $(2)_BUILD_CMDS define $(2)_BUILD_CMDS cd $$($$(PKG)_SRCDIR) && \ - $$(TARGET_MAKE_ENV) $$(HOST_DIR)/bin/python3 $$($(2)_WAF) \ + $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$(HOST_DIR)/bin/python3 $$($(2)_WAF) \ build $$(WAF_OPTS) $$($(2)_BUILD_OPTS) \ $$($(2)_WAF_OPTS) endef @@ -88,7 +88,7 @@ endif ifndef $(2)_INSTALL_STAGING_CMDS define $(2)_INSTALL_STAGING_CMDS cd $$($$(PKG)_SRCDIR) && \ - $$(TARGET_MAKE_ENV) $$(HOST_DIR)/bin/python3 $$($(2)_WAF) \ + $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$(HOST_DIR)/bin/python3 $$($(2)_WAF) \ install --destdir=$$(STAGING_DIR) \ $$($(2)_INSTALL_STAGING_OPTS) \ $$($(2)_WAF_OPTS) @@ -102,7 +102,7 @@ endif ifndef $(2)_INSTALL_TARGET_CMDS define $(2)_INSTALL_TARGET_CMDS cd $$($$(PKG)_SRCDIR) && \ - $$(TARGET_MAKE_ENV) $$(HOST_DIR)/bin/python3 $$($(2)_WAF) \ + $$(TARGET_MAKE_ENV) $$($$(PKG)_MAKE_ENV) $$(HOST_DIR)/bin/python3 $$($(2)_WAF) \ install --destdir=$$(TARGET_DIR) \ $$($(2)_INSTALL_TARGET_OPTS) \ $$($(2)_WAF_OPTS)