From 2618115c20fc871d8e77f1c43c1c67fb94b09a44 Mon Sep 17 00:00:00 2001 From: Romain Naour Date: Tue, 6 Dec 2016 20:49:08 +0100 Subject: [PATCH] pkg-waf: add a common variable for each step Some waf packages may want to pass additional variables to waf script for each build step. Add the possibility to do so by defining _WAF_OPTS. Signed-off-by: Romain Naour Signed-off-by: Thomas Petazzoni --- package/pkg-waf.mk | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk index f9d435e879..2cdd654b1b 100644 --- a/package/pkg-waf.mk +++ b/package/pkg-waf.mk @@ -52,6 +52,7 @@ endif $(2)_BUILD_OPTS ?= $(2)_INSTALL_STAGING_OPTS ?= $(2)_INSTALL_TARGET_OPTS ?= +$(2)_WAF_OPTS ?= # # Configure step. Only define it if not already defined by the package @@ -65,7 +66,8 @@ define $(2)_CONFIGURE_CMDS $$(HOST_DIR)/usr/bin/python2 $$($(2)_WAF) configure \ --prefix=/usr \ --libdir=/usr/lib \ - $$($(2)_CONF_OPTS) + $$($(2)_CONF_OPTS) \ + $$($(2)_WAF_OPTS) endef endif @@ -77,7 +79,8 @@ ifndef $(2)_BUILD_CMDS define $(2)_BUILD_CMDS cd $$(@D) && \ $$(TARGET_MAKE_ENV) $$(HOST_DIR)/usr/bin/python2 $$($(2)_WAF) \ - build -j $$(PARALLEL_JOBS) $$($(2)_BUILD_OPTS) + build -j $$(PARALLEL_JOBS) $$($(2)_BUILD_OPTS) \ + $$($(2)_WAF_OPTS) endef endif @@ -90,7 +93,8 @@ define $(2)_INSTALL_STAGING_CMDS cd $$(@D) && \ $$(TARGET_MAKE_ENV) $$(HOST_DIR)/usr/bin/python2 $$($(2)_WAF) \ install --destdir=$$(STAGING_DIR) \ - $$($(2)_INSTALL_STAGING_OPTS) + $$($(2)_INSTALL_STAGING_OPTS) \ + $$($(2)_WAF_OPTS) endef endif @@ -103,7 +107,8 @@ define $(2)_INSTALL_TARGET_CMDS cd $$(@D) && \ $$(TARGET_MAKE_ENV) $$(HOST_DIR)/usr/bin/python2 $$($(2)_WAF) \ install --destdir=$$(TARGET_DIR) \ - $$($(2)_INSTALL_TARGET_OPTS) + $$($(2)_INSTALL_TARGET_OPTS) \ + $$($(2)_WAF_OPTS) endef endif -- 2.30.2