summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/iptables/iptables
diff options
context:
space:
mode:
authorCristian Iorga <cristian.iorga@intel.com>2013-06-05 15:47:15 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-07 16:48:28 +0100
commitd3e982a6c49e1df631b6326710b216f23dca221c (patch)
treeeb129efb0858154672ae1eaa4d6d7dc6da686b61 /meta/recipes-extended/iptables/iptables
parentdfd0985065c3447df169198e8cd518e007f630ff (diff)
downloadpoky-d3e982a6c49e1df631b6326710b216f23dca221c.tar.gz
iptables: upgrade to 1.4.19.1
fix-iptables-extensions-build-error.patch no longer needed. (From OE-Core rev: 02971543527e993b60132ddb101a9093efa3f324) Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/iptables/iptables')
-rw-r--r--meta/recipes-extended/iptables/iptables/fix-iptables-extensions-build-error.patch44
1 files changed, 0 insertions, 44 deletions
diff --git a/meta/recipes-extended/iptables/iptables/fix-iptables-extensions-build-error.patch b/meta/recipes-extended/iptables/iptables/fix-iptables-extensions-build-error.patch
deleted file mode 100644
index 4cd919de19..0000000000
--- a/meta/recipes-extended/iptables/iptables/fix-iptables-extensions-build-error.patch
+++ /dev/null
@@ -1,44 +0,0 @@
1From 0a43f156e23edf616859ac5a8c90e41ccc5cb1cd Mon Sep 17 00:00:00 2001
2From: Cristian Iorga <cristian.iorga@intel.com>
3Date: Wed, 16 Jan 2013 20:14:43 +0200
4Subject: [PATCH] extensions: fix iptables extensions build error
5 in cross-compilation environments
6
7libtool is properly declared and used for cross-platform
8build environments
9
10Upstream-Status: Pending
11
12Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
13---
14 extensions/GNUmakefile.in | 5 +++--
15 1 file changed, 3 insertions(+), 2 deletions(-)
16
17diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
18index adad4d6..befb1fb 100644
19--- a/extensions/GNUmakefile.in
20+++ b/extensions/GNUmakefile.in
21@@ -13,6 +13,7 @@ xtlibdir = @xtlibdir@
22
23 CC = @CC@
24 CCLD = ${CC}
25+LIBTOOL = @LIBTOOL@
26 CFLAGS = @CFLAGS@
27 CPPFLAGS = @CPPFLAGS@
28 LDFLAGS = @LDFLAGS@
29@@ -94,10 +95,10 @@ lib%.so: lib%.la
30 ${AM_VERBOSE_NULL} ln -fs .libs/$@ $@
31
32 lib%.la: lib%.lo
33- ${AM_VERBOSE_CCLD} ../libtool ${AM_LIBTOOL_SILENT} --tag=CC --mode=link ${CCLD} ${AM_LDFLAGS} -module ${LDFLAGS} -o $@ $< ../libxtables/libxtables.la ${$*_LIBADD} -rpath ${xtlibdir}
34+ ${AM_VERBOSE_CCLD} ${LIBTOOL} ${AM_LIBTOOL_SILENT} --tag=CC --mode=link ${CCLD} ${AM_LDFLAGS} -module ${LDFLAGS} -o $@ $< ../libxtables/libxtables.la ${$*_LIBADD} -rpath ${xtlibdir}
35
36 lib%.lo: ${srcdir}/lib%.c
37- ${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 $<
38+ ${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 $<
39
40 libxt_NOTRACK.so: libxt_CT.so
41 ${AM_VERBOSE_GEN} ln -fs $< $@
42--
431.7.10.4
44