iptables: redo update to 1.4.18 with old linking-behaviour
[openwrt/svn-archive/archive.git] / package / network / utils / iptables / patches / 010-use-old-linking.patch
1 Index: iptables-1.4.18/extensions/GNUmakefile.in
2 ===================================================================
3 --- iptables-1.4.18.orig/extensions/GNUmakefile.in 2013-03-03 22:40:11.000000000 +0100
4 +++ iptables-1.4.18/extensions/GNUmakefile.in 2013-03-06 17:13:04.074584735 +0100
5 @@ -33,7 +33,6 @@
6 AM_VERBOSE_CXXLD = @echo " CXXLD " $@;
7 AM_VERBOSE_AR = @echo " AR " $@;
8 AM_VERBOSE_GEN = @echo " GEN " $@;
9 -AM_VERBOSE_NULL = @
10 endif
11
12 #
13 @@ -76,7 +75,7 @@
14 if test -n "${targets_install}"; then install -pm0755 $^ "${DESTDIR}${xtlibdir}/"; fi;
15
16 clean:
17 - rm -f *.la *.o *.lo *.so *.a {matches,targets}.man initext.c initext4.c initext6.c;
18 + rm -f *.o *.oo *.so *.a {matches,targets}.man initext.c initext4.c initext6.c;
19 rm -f .*.d .*.dd;
20
21 distclean: clean
22 @@ -90,22 +89,19 @@
23 #
24 # Shared libraries
25 #
26 -lib%.so: lib%.la
27 - ${AM_VERBOSE_NULL} ln -fs .libs/$@ $@
28 +lib%.so: lib%.oo
29 + ${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@ $< -L../libxtables/.libs -L../libiptc/.libs -lxtables ${$*_LIBADD};
30
31 -lib%.la: lib%.lo
32 - ${AM_VERBOSE_CCLD} ../libtool ${AM_LIBTOOL_SILENT} --tag=CC --mode=link ${CCLD} ${AM_LDFLAGS} -module ${LDFLAGS} -o $@ $< ../libxtables/libxtables.la ${$*_LIBADD} -rpath ${xtlibdir}
33 -
34 -lib%.lo: ${srcdir}/lib%.c
35 - ${AM_VERBOSE_CC} ../libtool ${AM_LIBTOOL_SILENT} --tag=CC --mode=compile ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init ${CFLAGS} -o $@ -c $<
36 +lib%.oo: ${srcdir}/lib%.c
37 + ${AM_VERBOSE_CC} ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init -DPIC -fPIC ${CFLAGS} -o $@ -c $<;
38
39 libxt_NOTRACK.so: libxt_CT.so
40 - ${AM_VERBOSE_GEN} ln -fs $< $@
41 + ln -fs $< $@
42 libxt_state.so: libxt_conntrack.so
43 - ${AM_VERBOSE_GEN} ln -fs $< $@
44 + ln -fs $< $@
45
46 # Need the LIBADDs in iptables/Makefile.am too for libxtables_la_LIBADD
47 -ip6t_NETMAP_LIBADD = ../libiptc/libip6tc.la
48 +ip6t_NETMAP_LIBADD = -lip6tc
49 xt_RATEEST_LIBADD = -lm
50 xt_statistic_LIBADD = -lm
51