cirros-testvm/src-cirros/buildroot-2015.05/package/iptables/0001-fix-static-link.patch

   1 From 76e230e41947576efb96e86e605bb84015cdb287 Mon Sep 17 00:00:00 2001
   2 From: Jan Engelhardt <jengelh@inai.de>
   3 Date: Tue, 13 Aug 2013 19:02:06 +0000
   4 Subject: iptables: link against libnetfilter_conntrack
   5
   6 Linking currently fails in --enable-static case:
   7
   8 ../extensions/libext.a(libxt_connlabel.o): In function `connlabel_get_name':
   9 iptables/extensions/libxt_connlabel.c:57: undefined reference to `nfct_labelmap_get_name'
  10 [..]
  11 It's libxtables.la(libxt_connlabel.o) using libnetfilter_conntrack.
  12
  13 If libnetfilter_conntrack is not found, @libnetfilter_conntrack_CFLAGS@
  14 and @libnetfilter_conntrack_LIBS@ (and their ${} ones) should be empty,
  15 therefore producing no harm to include unconditionally.
  16
  17 [Gustavo: update for iptables 1.4.21]
  18 Reported-and-tested-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
  19 Signed-off-by: Florian Westphal <fw@strlen.de>
  20 ---
  21 diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
  22 index 14e7c57..780e715 100644
  23 --- a/extensions/GNUmakefile.in
  24 +++ b/extensions/GNUmakefile.in
  25 @@ -21,7 +21,7 @@ regular_CPPFLAGS   = @regular_CPPFLAGS@
  26  kinclude_CPPFLAGS  = @kinclude_CPPFLAGS@
  27
  28  AM_CFLAGS       = ${regular_CFLAGS}
  29 -AM_CPPFLAGS     = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include ${kinclude_CPPFLAGS} ${CPPFLAGS}
  30 +AM_CPPFLAGS     = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include ${kinclude_CPPFLAGS} ${CPPFLAGS} @libnetfilter_conntrack_CFLAGS@
  31  AM_DEPFLAGS     = -Wp,-MMD,$(@D)/.$(@F).d,-MT,$@
  32  AM_LDFLAGS      = @noundef_LDFLAGS@
  33
  34 @@ -93,7 +93,7 @@ lib%.so: lib%.oo
  35         ${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@ $< -L../libxtables/.libs -lxtables ${$*_LIBADD};
  36
  37  lib%.oo: ${srcdir}/lib%.c
  38 -       ${AM_VERBOSE_CC} ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init -DPIC -fPIC ${CFLAGS} ${$*_CFLAGADD} -o $@ -c $<;
  39 +       ${AM_VERBOSE_CC} ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init -DPIC -fPIC ${CFLAGS} -o $@ -c $<;
  40
  41  libxt_NOTRACK.so: libxt_CT.so
  42         ln -fs $< $@
  43 @@ -103,9 +103,7 @@ libxt_state.so: libxt_conntrack.so
  44  # Need the LIBADDs in iptables/Makefile.am too for libxtables_la_LIBADD
  45  xt_RATEEST_LIBADD   = -lm
  46  xt_statistic_LIBADD = -lm
  47 -@HAVE_LIBNETFILTER_CONNTRACK_TRUE@xt_connlabel_LIBADD = @libnetfilter_conntrack_LIBS@
  48 -
  49 -@HAVE_LIBNETFILTER_CONNTRACK_TRUE@xt_connlabel_CFLAGADD = @libnetfilter_conntrack_CFLAGS@
  50 +xt_connlabel_LIBADD = @libnetfilter_conntrack_LIBS@
  51
  52  #
  53  #      Static bits
  54 diff --git a/libxtables/Makefile.am b/libxtables/Makefile.am
  55 index c5795fe..4267cb5 100644
  56 --- a/libxtables/Makefile.am
  57 +++ b/libxtables/Makefile.am
  58 @@ -10,7 +10,7 @@ libxtables_la_LIBADD  =
  59  if ENABLE_STATIC
  60  # With --enable-static, shipped extensions are linked into the main executable,
  61  # so we need all the LIBADDs here too
  62 -libxtables_la_LIBADD += -lm
  63 +libxtables_la_LIBADD += -lm ${libnetfilter_conntrack_LIBS}
  64  endif
  65  if ENABLE_SHARED
  66  libxtables_la_CFLAGS  = ${AM_CFLAGS}
  67 --
  68 cgit v0.9.2