Message ID | 1435581954-16197-1-git-send-email-gustavo@zacarias.com.ar |
---|---|
State | Accepted |
Headers | show |
Dear Gustavo Zacarias, On Mon, 29 Jun 2015 09:45:54 -0300, Gustavo Zacarias wrote: > Fixes: > http://autobuild.buildroot.net/results/173/173c9dbed6422a3cc4f9d1f998bc25ce2e9538c7/ > > Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> > --- > package/iproute2/iproute2.mk | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) Applied, thanks. Thomas
diff --git a/package/iproute2/iproute2.mk b/package/iproute2/iproute2.mk index dabc8b4..b2627ec 100644 --- a/package/iproute2/iproute2.mk +++ b/package/iproute2/iproute2.mk @@ -17,8 +17,13 @@ ifeq ($(BR2_PACKAGE_BUSYBOX),y) IPROUTE2_DEPENDENCIES += busybox endif -ifeq ($(BR2_PACKAGE_LIBMNL),y) +# tipc support needs 3.18+ headers and libmnl +ifeq ($(BR2_PACKAGE_LIBMNL)$(BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18),yy) IPROUTE2_DEPENDENCIES += libmnl +else +define IPROUTE2_DISABLE_TIPC + $(SED) '/HAVE_MNL/d' $(@D)/Config +endef endif # If we've got iptables enable xtables support for tc @@ -57,6 +62,7 @@ define IPROUTE2_CONFIGURE_CMDS cd $(@D) && $(TARGET_CONFIGURE_OPTS) ./configure $(IPROUTE2_DISABLE_ARPD) $(IPROUTE2_WITH_IPTABLES) + $(IPROUTE2_DISABLE_TIPC) endef define IPROUTE2_BUILD_CMDS
Fixes: http://autobuild.buildroot.net/results/173/173c9dbed6422a3cc4f9d1f998bc25ce2e9538c7/ Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> --- package/iproute2/iproute2.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)