c5426a2ad4
Refresh patches to clear patch fuzz Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
27 lines
878 B
Diff
27 lines
878 B
Diff
The miniupnpd makefile tries to autodetect iptables capabilities.
|
|
This will incorrectly detect capabilities such as ipv6 support even though it is disabled for the target build.
|
|
|
|
As the OpenWRT buildsystem already passes the right compile flags, we can skip the autodetection.
|
|
|
|
|
|
--- a/netfilter/Makefile
|
|
+++ b/netfilter/Makefile
|
|
@@ -38,8 +38,6 @@ endif
|
|
endif
|
|
endif
|
|
|
|
-LIBS += /lib/libip4tc.so /lib/libip6tc.so
|
|
-
|
|
all: iptcrdr.o testiptcrdr iptpinhole.o \
|
|
testiptcrdr_peer testiptcrdr_dscp test_nfct_get
|
|
# testiptpinhole
|
|
--- a/Makefile.linux
|
|
+++ b/Makefile.linux
|
|
@@ -73,7 +73,6 @@ CPPFLAGS += -DIPTABLES_143
|
|
endif
|
|
|
|
CFLAGS += $(shell $(PKG_CONFIG) --cflags libiptc)
|
|
-LDLIBS += $(shell $(PKG_CONFIG) --static --libs-only-l libiptc)
|
|
LDFLAGS += $(shell $(PKG_CONFIG) --libs-only-L libiptc)
|
|
LDFLAGS += $(shell $(PKG_CONFIG) --libs-only-other libiptc)
|
|
else
|