From patchwork Mon May 18 20:54:13 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 473600 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 84EF714029C for ; Tue, 19 May 2015 06:54:24 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id B5232A1CCB; Mon, 18 May 2015 20:54:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id t-kHCVbQNcje; Mon, 18 May 2015 20:54:22 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 90885A1BC1; Mon, 18 May 2015 20:54:22 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id A17AC1C2238 for ; Mon, 18 May 2015 20:54:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 9C5B695424 for ; Mon, 18 May 2015 20:54:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id GUnU06Pg2p2G for ; Mon, 18 May 2015 20:54:19 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from smtp1-g21.free.fr (smtp1-g21.free.fr [212.27.42.1]) by hemlock.osuosl.org (Postfix) with ESMTPS id 416CB95421 for ; Mon, 18 May 2015 20:54:19 +0000 (UTC) Received: from localhost.localdomain (unknown [81.57.22.125]) by smtp1-g21.free.fr (Postfix) with ESMTP id 4582194003E; Mon, 18 May 2015 22:50:57 +0200 (CEST) From: Romain Naour To: buildroot@buildroot.org Date: Mon, 18 May 2015 22:54:13 +0200 Message-Id: <1431982453-17867-1-git-send-email-romain.naour@openwide.fr> X-Mailer: git-send-email 1.9.3 Subject: [Buildroot] [PATCH] package/iproute2: disable iptables support for static build X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" If iptable support is enabled, it will try to build m_xt.so even for static build only. So, disable iptables support for static build and remove TC_CONFIG_IPSET and TC_CONFIG_XT if previously added by the configure script. Fixes: http://autobuild.buildroot.net/results/3b3/3b37871bdf5766677fc20dca22c13177091d104f/ Signed-off-by: Romain Naour --- package/iproute2/iproute2.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk index 9595165..d97e75e 100644 --- a/package/iproute2/iproute2.mk +++ b/package/iproute2/iproute2.mk @@ -18,7 +18,7 @@ IPROUTE2_DEPENDENCIES += busybox endif # If we've got iptables enable xtables support for tc -ifeq ($(BR2_PACKAGE_IPTABLES),y) +ifeq ($(BR2_PACKAGE_IPTABLES)x$(BR2_STATIC_LIBS),yx) IPROUTE2_DEPENDENCIES += iptables define IPROUTE2_WITH_IPTABLES # Makefile is busted so it never passes IPT_LIB_DIR properly @@ -27,6 +27,9 @@ define IPROUTE2_WITH_IPTABLES endef else define IPROUTE2_WITH_IPTABLES + # delete TC_CONFIG_IPSET and TC_CONFIG_XT if any + $(SED) '/TC_CONFIG_IPSET/d' $(IPROUTE2_DIR)/Config + $(SED) '/TC_CONFIG_XT/d' $(IPROUTE2_DIR)/Config # em_ipset needs xtables, but configure misdetects it echo "TC_CONFIG_IPSET:=n" >>$(IPROUTE2_DIR)/Config endef