Jan Engelhardt
ec778bd5ec
OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iproute2?expand=0&rev=35
43 lines
1.5 KiB
Diff
43 lines
1.5 KiB
Diff
From: Jan Engelhardt <jengelh@medozas.de>
|
|
Date: 2011-09-24 23:37:34.405739159 +0200
|
|
Upstream: not sent yet
|
|
|
|
Any tests involving iptables _MUST_ utilize pkg-config to find the
|
|
proper locations of the installation.
|
|
|
|
---
|
|
configure | 2 +-
|
|
tc/Makefile | 4 ++--
|
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
Index: iproute2-2.6.39/configure
|
|
===================================================================
|
|
--- iproute2-2.6.39.orig/configure
|
|
+++ iproute2-2.6.39/configure
|
|
@@ -49,7 +49,7 @@ int main(int argc, char **argv)
|
|
|
|
EOF
|
|
|
|
-if gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL -ldl -lxtables >/dev/null 2>&1
|
|
+if gcc -I$INCLUDE $IPTC -o /tmp/ipttest /tmp/ipttest.c $IPTL $(pkg-config xtables --cflags --libs) -ldl >/dev/null 2>&1
|
|
then
|
|
echo "TC_CONFIG_XT:=y" >>Config
|
|
echo "using xtables"
|
|
Index: iproute2-2.6.39/tc/Makefile
|
|
===================================================================
|
|
--- iproute2-2.6.39.orig/tc/Makefile
|
|
+++ iproute2-2.6.39/tc/Makefile
|
|
@@ -124,10 +124,10 @@ q_atm.so: q_atm.c
|
|
$(CC) $(CFLAGS) $(LDFLAGS) -shared -fpic -o q_atm.so q_atm.c -latm
|
|
|
|
m_xt.so: m_xt.c
|
|
- $(CC) $(CFLAGS) $(LDFLAGS) -shared -fpic -o m_xt.so m_xt.c -lxtables
|
|
+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -fpic -o m_xt.so m_xt.c $$(pkg-config xtables --cflags --libs)
|
|
|
|
m_xt_old.so: m_xt_old.c
|
|
- $(CC) $(CFLAGS) $(LDFLAGS) -shared -fpic -o m_xt_old.so m_xt_old.c -lxtables
|
|
+ $(CC) $(CFLAGS) $(LDFLAGS) -shared -fpic -o m_xt_old.so m_xt_old.c $$(pkg-config xtables --cflags --libs)
|
|
|
|
%.yacc.c: %.y
|
|
$(YACC) $(YACCFLAGS) -o $@ $<
|