From 92fbfa9cbe4be7e12a7b9a5da593cbc087c7c594 Mon Sep 17 00:00:00 2001 From: pedro Date: Tue, 30 Jul 2019 12:53:41 +0200 Subject: [PATCH] ebtables: build ipv6 extension only if needed --- release/src-rt-6.x.4708/router/Makefile | 14 +++++++++----- .../ebtables/104-do-not-build-ipv6-extension.patch | 11 +++++++++++ 2 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 release/src-rt-6.x.4708/router/patches/ebtables/104-do-not-build-ipv6-extension.patch diff --git a/release/src-rt-6.x.4708/router/Makefile b/release/src-rt-6.x.4708/router/Makefile index 4e2514f1f2..c7475c0e10 100644 --- a/release/src-rt-6.x.4708/router/Makefile +++ b/release/src-rt-6.x.4708/router/Makefile @@ -1766,13 +1766,17 @@ wanuptime-install: $(STRIP) $(INSTALLDIR)/wanuptime/usr/sbin/wanuptime ebtables/stamp-h1: dummy +ifeq ($(TCONFIG_IPV6),y) + mv patches/ebtables/104-do-not-build-ipv6-extension.patch patches/ebtables/104-do-not-build-ipv6-extension.patch.tmp || true +else + mv patches/ebtables/104-do-not-build-ipv6-extension.patch.tmp patches/ebtables/104-do-not-build-ipv6-extension.patch || true +endif $(call patch_files,ebtables) - cd $(TOP)/ebtables && CC=$(CC) LD=$(LD) STRIP=$(CROSS_COMPILE)strip \ - ./autogen.sh && \ + cd $(TOP)/ebtables && ./autogen.sh && \ $(CONFIGURE) --prefix=/usr --bindir=/usr/sbin --sysconfdir=/etc --libdir=/usr/lib \ - CFLAGS="-Os $(EXTRACFLAGS) -ffunction-sections -fdata-sections -Wl,--gc-sections" \ - LDFLAGS="-ffunction-sections -fdata-sections -Wl,--gc-sections" \ - LOCKFILE="/var/lock/ebtables" + CFLAGS="-Os $(EXTRACFLAGS) -ffunction-sections -fdata-sections" \ + LDFLAGS="-ffunction-sections -fdata-sections -Wl,--gc-sections -fPIC" \ + LOCKFILE="/var/lock/ebtables" touch ebtables/stamp-h1 ebtables: ebtables/stamp-h1 diff --git a/release/src-rt-6.x.4708/router/patches/ebtables/104-do-not-build-ipv6-extension.patch b/release/src-rt-6.x.4708/router/patches/ebtables/104-do-not-build-ipv6-extension.patch new file mode 100644 index 0000000000..309c8dfbaf --- /dev/null +++ b/release/src-rt-6.x.4708/router/patches/ebtables/104-do-not-build-ipv6-extension.patch @@ -0,0 +1,11 @@ +--- ebtables/Makefile.am ++++ ebtables/Makefile.am +@@ -35,7 +35,7 @@ lib_LTLIBRARIES = libebtc.la + communication.c ebtables.c getethertype.c \ + libebtc.c useful_functions.c \ + extensions/ebt_arp.c \ +- extensions/ebt_arpreply.c extensions/ebt_ip.c extensions/ebt_ip6.c \ ++ extensions/ebt_arpreply.c extensions/ebt_ip.c \ + extensions/ebt_limit.c extensions/ebt_log.c extensions/ebt_mark.c \ + extensions/ebt_nat.c \ + extensions/ebt_pkttype.c extensions/ebt_redirect.c \