|
@@ -0,0 +1,35 @@
|
|
|
|
|
+From 6ddb36c3a9686df1cca2f4d06518395f1eb9d5cc Mon Sep 17 00:00:00 2001
|
|
|
|
|
+From: Syrone Wong <[email protected]>
|
|
|
|
|
+Date: Wed, 12 Dec 2018 19:35:08 +0800
|
|
|
|
|
+Subject: [PATCH] tc: fix xtables incorrect usage of LDFLAGS
|
|
|
|
|
+
|
|
|
|
|
+The incorrect setting of LDFLAGS causes error below:
|
|
|
|
|
+
|
|
|
|
|
+> em_ipt.o: In function `em_ipt_print_epot':
|
|
|
|
|
+> em_ipt.c:(.text.em_ipt_print_epot+0x2e): undefined reference to
|
|
|
|
|
+> `xtables_init_all'
|
|
|
|
|
+
|
|
|
|
|
+em_ipt.c gets involved when TC_CONFIG_XT=y, which requires xtables,
|
|
|
|
|
+while tc/Makefile doesn't pass flags correctly. It adds '-lxtables'
|
|
|
|
|
+to LDFLAGS instead of LDLIBS.
|
|
|
|
|
+
|
|
|
|
|
+Fixes: dd296215 ("tc: add em_ipt ematch for calling xtables matches from tc matching context")
|
|
|
|
|
+
|
|
|
|
|
+Signed-off-by: Syrone Wong <[email protected]>
|
|
|
|
|
+Acked-by: Eyal Birger <[email protected]>
|
|
|
|
|
+Signed-off-by: Stephen Hemminger <[email protected]>
|
|
|
|
|
+---
|
|
|
|
|
+ tc/Makefile | 2 +-
|
|
|
|
|
+ 1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
|
+
|
|
|
|
|
+--- a/tc/Makefile
|
|
|
|
|
++++ b/tc/Makefile
|
|
|
|
|
+@@ -170,7 +170,7 @@ em_ipset.o: CFLAGS += $$($(PKG_CONFIG) x
|
|
|
|
|
+ em_ipt.o: CFLAGS += $$($(PKG_CONFIG) xtables --cflags)
|
|
|
|
|
+
|
|
|
|
|
+ ifeq ($(TC_CONFIG_XT),y)
|
|
|
|
|
+- LDFLAGS += $$($(PKG_CONFIG) xtables --libs)
|
|
|
|
|
++ LDLIBS += $$($(PKG_CONFIG) xtables --libs)
|
|
|
|
|
+ endif
|
|
|
|
|
+
|
|
|
|
|
+ %.yacc.c: %.y
|