Repository : ssh://git@open-mesh.org/openwrt-feed-batman-adv
On branch : master
commit f41a85c9984dcffea1737ccf85c47335350df4f3 Author: Sven Eckelmann sven@narfation.org Date: Tue May 7 14:51:07 2013 +0200
batman-adv-devel: Add missing TARGET_* flags to batctl compile
The compilation step of batctl completely dropped the TARGET_CFLAGS, TARGET_CPPFLAGS and TARGET_LDFLAGS and therefore weren't compiled and linked with the flags given by the OpenWRT build environment.
Signed-off-by: Sven Eckelmann sven@narfation.org Signed-off-by: Marek Lindner lindner_marek@yahoo.de
f41a85c9984dcffea1737ccf85c47335350df4f3 batman-adv-devel/Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/batman-adv-devel/Makefile b/batman-adv-devel/Makefile index 0958f38..db93ac7 100644 --- a/batman-adv-devel/Makefile +++ b/batman-adv-devel/Makefile @@ -64,6 +64,11 @@ MAKE_BATMAN_ADV_ARGS += \ CONFIG_BATMAN_ADV_NC=$(if $(CONFIG_KMOD_BATMAN_ADV_DEVEL_NC),y,n) \ REVISION="$(PKG_BATMAN_SHORTREV)" all
+MAKE_BATCTL_ENV += \ + CPPFLAGS="$(TARGET_CPPFLAGS)" \ + CFLAGS="$(TARGET_CFLAGS)" \ + LDFLAGS="$(TARGET_LDFLAGS)" + MAKE_BATCTL_ARGS += \ CFLAGS="$(TARGET_CFLAGS)" \ CCFLAGS="$(TARGET_CFLAGS)" \ @@ -85,7 +90,7 @@ $(eval $(call Download,batctl))
BATCTL_EXTRACT = tar xzf "$(DL_DIR)/$(PKG_BATCTL_FNAME)" -C "$(BUILD_DIR)/$(PKG_NAME)" BATCTL_PATCH = $(call Build/DoPatch,"$(PKG_BATCTL_BUILD_DIR)","$(PATCH_DIR)","*batctl*") -BATCTL_BUILD = $(MAKE) -C $(PKG_BATCTL_BUILD_DIR) $(MAKE_BATCTL_ARGS) +BATCTL_BUILD = $(MAKE_BATCTL_ENV) $(MAKE) -C $(PKG_BATCTL_BUILD_DIR) $(MAKE_BATCTL_ARGS) BATCTL_INSTALL = $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/local/sbin/batctl $(1)/usr/sbin/ endif