From a9aa2ba02f5457ff4cbb10d0812568e0f8174492 Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Thu, 21 May 2015 16:29:28 +0200 Subject: [PATCH] iproute2: needs host-pkgconf The (handwritten) configure script uses pkg-config, so ensure it is available. With this in place XT and IPT_LIB_DIR detection works correctly, so drop the overrides. Signed-off-by: Peter Korsgaard --- package/iproute2/iproute2.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk index 3315d67c46..ab374e1b55 100644 --- a/package/iproute2/iproute2.mk +++ b/package/iproute2/iproute2.mk @@ -7,7 +7,7 @@ IPROUTE2_VERSION = 4.0.0 IPROUTE2_SOURCE = iproute2-$(IPROUTE2_VERSION).tar.xz IPROUTE2_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/net/iproute2 -IPROUTE2_DEPENDENCIES = host-bison host-flex +IPROUTE2_DEPENDENCIES = host-bison host-flex host-pkgconf IPROUTE2_LICENSE = GPLv2 IPROUTE2_LICENSE_FILES = COPYING @@ -23,7 +23,6 @@ IPROUTE2_DEPENDENCIES += iptables define IPROUTE2_WITH_IPTABLES # Makefile is busted so it never passes IPT_LIB_DIR properly $(SED) "s/-DIPT/-DXT/" $(IPROUTE2_DIR)/tc/Makefile - echo "TC_CONFIG_XT:=y" >>$(IPROUTE2_DIR)/Config endef else define IPROUTE2_WITH_IPTABLES @@ -53,7 +52,6 @@ define IPROUTE2_CONFIGURE_CMDS $(SED) 's/gcc/$$CC $$CFLAGS/g' $(@D)/configure cd $(@D) && $(TARGET_CONFIGURE_OPTS) ./configure $(SED) 's/-Werror//' $(IPROUTE2_DIR)/Makefile - echo "IPT_LIB_DIR:=/usr/lib/xtables" >>$(IPROUTE2_DIR)/Config $(IPROUTE2_DISABLE_ARPD) $(IPROUTE2_WITH_IPTABLES) endef -- 2.30.2