mirror of https://github.com/openwrt/packages.git
xtables-addons: fix broken compile with external Toolchain
Fix broken compile with external Toolchain. Commitpull/23991/head32aaaaa7d3
("xtables-addons: pass correct flags to compile and install") simplified and dropped the custom Compile/Install in favor of the default one. Problem is that it dropped DESTDIR resulting in the package having problem on finishing install. The commit then was reworked withc83b8787a5
("xtables-addons: adapt build to EXTERNAL_TOOLCHAIN" that reintroduced DESTDIR and also introduced a useless custom flag to fix wrong ARCH. ARCH is fixed by kernel.mk and doesn't depend on external Toolchain or not. For ARCH that require fixing, kernel.mk should be fixed instead of adding custom function to packages Makefile. Drop the custom ARCH handling and use Compile/Install everytime. Fixes:32aaaaa7d3
("xtables-addons: pass correct flags to compile and install") Fixes:c83b8787a5
("xtables-addons: adapt build to EXTERNAL_TOOLCHAIN") Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
parent
38560743c4
commit
466ed55d59
|
@ -41,15 +41,6 @@ CONFIGURE_ARGS+= \
|
|||
--with-kbuild="$(LINUX_DIR)" \
|
||||
--with-xtlibdir="/usr/lib/iptables"
|
||||
|
||||
ifdef CONFIG_EXTERNAL_TOOLCHAIN
|
||||
MAKE_FLAGS:= \
|
||||
$(patsubst ARCH=%,ARCH=$(LINUX_KARCH),$(MAKE_FLAGS)) \
|
||||
DEPMOD="/bin/true"
|
||||
|
||||
MAKE_INSTALL_FLAGS:= \
|
||||
$(patsubst ARCH=%,ARCH=$(LINUX_KARCH),$(MAKE_FLAGS)) \
|
||||
DEPMOD="/bin/true"
|
||||
else
|
||||
define Build/Compile
|
||||
+$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
|
||||
$(KERNEL_MAKE_FLAGS) \
|
||||
|
@ -65,7 +56,6 @@ define Build/Install
|
|||
DEPMOD="/bin/true" \
|
||||
install
|
||||
endef
|
||||
endif
|
||||
|
||||
# 1: extension/module suffix used in package name
|
||||
# 2: extension/module display name used in package title/description
|
||||
|
|
Loading…
Reference in New Issue