Skip to contentSkip to conversation

iproute2: fix build with threads support disabled

PATCH New Baruch Siach 3 participants 5 messages Dec 17, 2017 – Dec 18, 2017

lore
Share & tools
lore

Baruch Siach

author
#0 lore raw

PATCH 1/2 iproute2: fix build with threads support disabled

iproute2 renamed the configure script generated file to config.mk. Update the berkeleydb disable code.

Fixes:
http://autobuild.buildroot.net/results/46d/46da1142806fb524326994585cec6de9f7f3f480/
http://autobuild.buildroot.net/results/3aa/3aa028fe9e730335d2af00d5969b674a3d9f640b/

Cc Petr Vorel <[email protected]>
Signed-off-by Baruch Siach <[email protected]>
---
 package/iproute2/iproute2.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
package/iproute2/iproute2.mk +1 -1
index b75349dbce70..c01917dffef0 100644
@@ -42,7 +42,7 @@ ifeq ($(BR2_PACKAGE_BERKELEYDB_COMPAT185)$(BR2_TOOLCHAIN_HAS_THREADS),yy)
 IPROUTE2_DEPENDENCIES += berkeleydb
 else
 define IPROUTE2_DISABLE_ARPD
-	echo "HAVE_BERKELEY_DB:=n" >> $(@D)/Config
+	echo "HAVE_BERKELEY_DB:=n" >> $(@D)/config.mk
 endef
 endif
Signature · 1 line
2.15.1
author
#1 lore raw

PATCH 2/2 iproute2: fix configure output file name

iproute2 renamed the configure script output file to config.mk. Update the config tweaking code accordingly.

The configure script now detects xtables correctly, drop this part.

Add a comment to explain the TC_CONFIG_XT disable tweak.

Cc Petr Vorel <[email protected]>
Signed-off-by Baruch Siach <[email protected]>
---
 package/iproute2/iproute2.mk | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
package/iproute2/iproute2.mk +2 -3
index c01917dffef0..15bb132c5001 100644
@@ -31,9 +31,8 @@ define IPROUTE2_WITH_IPTABLES
 endef
 else
 define IPROUTE2_WITH_IPTABLES
-	# em_ipset needs xtables, but configure misdetects it
-	echo "TC_CONFIG_IPSET:=n" >>$(@D)/Config
-	echo "TC_CONFIG_XT:=n" >>$(@D)/Config
+	# m_xt.so is built unconditionally
+	echo "TC_CONFIG_XT:=n" >>$(@D)/config.mk
 endef
 endif
Signature · 1 line
2.15.1
#3 lore raw

PATCH 1/2 iproute2: fix build with threads support disabled

In reply to Baruch Siach
Quoted 10 lines

iproute2 renamed the configure script generated file to config.mk. Update the berkeleydb disable code.

Fixes:
http://autobuild.buildroot.net/results/46d/46da1142806fb524326994585cec6de9f7f3f480/
http://autobuild.buildroot.net/results/3aa/3aa028fe9e730335d2af00d5969b674a3d9f640b/

Cc Petr Vorel <[email protected]>
Signed-off-by Baruch Siach <[email protected]>

---

Acked-by Petr Vorel <[email protected]>
#4 lore raw

PATCH 1/2 iproute2: fix build with threads support disabled

In reply to Baruch Siach

Hello,

Quoted 7 lines · Baruch Siach

iproute2 renamed the configure script generated file to config.mk. Update the berkeleydb disable code.

Fixes:
http://autobuild.buildroot.net/results/46d/46da1142806fb524326994585cec6de9f7f3f480/
http://autobuild.buildroot.net/results/3aa/3aa028fe9e730335d2af00d5969b674a3d9f640b/

Quoted 5 lines
Cc Petr Vorel <[email protected]>
Signed-off-by Baruch Siach <[email protected]>
---
 package/iproute2/iproute2.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Both patches applied. Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com