log4cplus: add C++11 dependencies

[coffee/buildroot.git] / package / pkg-waf.mk

diff --git a/package/pkg-waf.mk b/package/pkg-waf.mk
index a82f45ce4919fa8b94eea355d9dbef748d9563b9..e5b606f0635f400e60223097dd8f624e6451067b 100644 (file)
--- a/package/pkg-waf.mk
+++ b/package/pkg-waf.mk
@@ -44,13 +44,15 @@ $(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)/usr/bin/waf
+$(2)_WAF = $(HOST_DIR)/bin/waf
 else
 $(2)_WAF = ./waf
 endif
 
-$(2)_INSTALL_STAGING_OPTS              ?=
-$(2)_INSTALL_TARGET_OPTS               ?=
+$(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
@@ -61,10 +63,11 @@ define $(2)_CONFIGURE_CMDS
        cd $$(@D) && \
        $$(TARGET_CONFIGURE_OPTS) \
        $$($(2)_CONF_ENV) \
-       $$(HOST_DIR)/usr/bin/python2 $$($(2)_WAF) configure \
+       $$(HOST_DIR)/bin/python2 $$($(2)_WAF) configure \
                --prefix=/usr \
                --libdir=/usr/lib \
-               $$($(2)_CONF_OPTS)
+               $$($(2)_CONF_OPTS) \
+               $$($(2)_WAF_OPTS)
 endef
 endif
 
@@ -75,7 +78,9 @@ endif
 ifndef $(2)_BUILD_CMDS
 define $(2)_BUILD_CMDS
        cd $$(@D) && \
-       $$(TARGET_MAKE_ENV) $$(HOST_DIR)/usr/bin/python2 $$($(2)_WAF) build -j $$(PARALLEL_JOBS)
+       $$(TARGET_MAKE_ENV) $$(HOST_DIR)/bin/python2 $$($(2)_WAF) \
+               build -j $$(PARALLEL_JOBS) $$($(2)_BUILD_OPTS) \
+               $$($(2)_WAF_OPTS)
 endef
 endif
 
@@ -86,9 +91,10 @@ endif
 ifndef $(2)_INSTALL_STAGING_CMDS
 define $(2)_INSTALL_STAGING_CMDS
        cd $$(@D) && \
-       $$(TARGET_MAKE_ENV) $$(HOST_DIR)/usr/bin/python2 $$($(2)_WAF) \
+       $$(TARGET_MAKE_ENV) $$(HOST_DIR)/bin/python2 $$($(2)_WAF) \
                install --destdir=$$(STAGING_DIR) \
-               $$($(2)_INSTALL_STAGING_OPTS)
+               $$($(2)_INSTALL_STAGING_OPTS) \
+               $$($(2)_WAF_OPTS)
 endef
 endif
 
@@ -99,9 +105,10 @@ endif
 ifndef $(2)_INSTALL_TARGET_CMDS
 define $(2)_INSTALL_TARGET_CMDS
        cd $$(@D) && \
-       $$(TARGET_MAKE_ENV) $$(HOST_DIR)/usr/bin/python2 $$($(2)_WAF) \
+       $$(TARGET_MAKE_ENV) $$(HOST_DIR)/bin/python2 $$($(2)_WAF) \
                install --destdir=$$(TARGET_DIR) \
-               $$($(2)_INSTALL_TARGET_OPTS)
+               $$($(2)_INSTALL_TARGET_OPTS) \
+               $$($(2)_WAF_OPTS)
 endef
 endif