From: Sébastien Blin <redacted>
Date: Sat, 2 Mar 2019 15:31:22 +0000 (-0500)
Subject: xtables-addons: pass correct flags to compile and install
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=32aaaaa7d37980de7482a49a729009cad6b3e28d;p=openwrt-packages.git

xtables-addons: pass correct flags to compile and install

The Makefile currently redefine the Compile and Install functions.
This is not working when using an external toolchain because some
flags are not interpreted, like CROSS_COMPILE. It is possible to
override the MAKE_FLAGS and MAKE_INSTALL_FLAGS instead.

Signed-off-by: Sébastien Blin <redacted>
---

diff --git a/net/xtables-addons/Makefile b/net/xtables-addons/Makefile
index ee1ad44a3..948f2b826 100644
--- a/net/xtables-addons/Makefile
+++ b/net/xtables-addons/Makefile
@@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=xtables-addons
 PKG_VERSION:=2.14
-PKG_RELEASE:=6
+PKG_RELEASE:=7
 PKG_HASH:=d215a9a8b8e66aae04b982fa2e1228e8a71e7dfe42320df99e34e5000cbdf152
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
@@ -39,23 +39,13 @@ endef
 
 CONFIGURE_ARGS+= \
 	--with-kbuild="$(LINUX_DIR)" \
-	--with-xtlibdir="/usr/lib/iptables" \
-
-define Build/Compile
-	+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
-		$(KERNEL_MAKE_FLAGS) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		DEPMOD="/bin/true" \
-		all
-endef
+	--with-xtlibdir="/usr/lib/iptables"
 
-define Build/Install
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		$(KERNEL_MAKE_FLAGS) \
-		DESTDIR="$(PKG_INSTALL_DIR)" \
-		DEPMOD="/bin/true" \
-		install
-endef
+MAKE_FLAGS += \
+	DEPMOD="/bin/true"
+
+MAKE_INSTALL_FLAGS += \
+	DEPMOD="/bin/true"
 
 # 1: extension/module suffix used in package name
 # 2: extension/module display name used in package title/description