diff options
| -rw-r--r-- | meta/recipes-extended/iptables/iptables/fix-iptables-extensions-build-error.patch | 44 | ||||
| -rw-r--r-- | meta/recipes-extended/iptables/iptables_1.4.19.1.bb (renamed from meta/recipes-extended/iptables/iptables_1.4.18.bb) | 5 |
2 files changed, 2 insertions, 47 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 @@ | |||
| 1 | From 0a43f156e23edf616859ac5a8c90e41ccc5cb1cd Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Cristian Iorga <cristian.iorga@intel.com> | ||
| 3 | Date: Wed, 16 Jan 2013 20:14:43 +0200 | ||
| 4 | Subject: [PATCH] extensions: fix iptables extensions build error | ||
| 5 | in cross-compilation environments | ||
| 6 | |||
| 7 | libtool is properly declared and used for cross-platform | ||
| 8 | build environments | ||
| 9 | |||
| 10 | Upstream-Status: Pending | ||
| 11 | |||
| 12 | Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> | ||
| 13 | --- | ||
| 14 | extensions/GNUmakefile.in | 5 +++-- | ||
| 15 | 1 file changed, 3 insertions(+), 2 deletions(-) | ||
| 16 | |||
| 17 | diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in | ||
| 18 | index 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 | -- | ||
| 43 | 1.7.10.4 | ||
| 44 | |||
diff --git a/meta/recipes-extended/iptables/iptables_1.4.18.bb b/meta/recipes-extended/iptables/iptables_1.4.19.1.bb index bb8718f3b1..a98ad4c0bb 100644 --- a/meta/recipes-extended/iptables/iptables_1.4.18.bb +++ b/meta/recipes-extended/iptables/iptables_1.4.19.1.bb | |||
| @@ -21,12 +21,11 @@ FILES_${PN}-dbg =+ "${libdir}/xtables/.debug" | |||
| 21 | 21 | ||
| 22 | SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 \ | 22 | SRC_URI = "http://netfilter.org/projects/iptables/files/iptables-${PV}.tar.bz2 \ |
| 23 | file://types.h-add-defines-that-are-required-for-if_packet.patch \ | 23 | file://types.h-add-defines-that-are-required-for-if_packet.patch \ |
| 24 | file://fix-iptables-extensions-build-error.patch \ | ||
| 25 | file://0001-configure-Add-option-to-enable-disable-libnfnetlink.patch \ | 24 | file://0001-configure-Add-option-to-enable-disable-libnfnetlink.patch \ |
| 26 | " | 25 | " |
| 27 | 26 | ||
| 28 | SRC_URI[md5sum] = "a819199d5ec013b82da13a8ffbba857e" | 27 | SRC_URI[md5sum] = "be97ce9007fa42c867901b496c935a0a" |
| 29 | SRC_URI[sha256sum] = "14a99fb8b0ca22027a9ac6eb72fa32c834ceb3073820e0ba79bf251c6a7bcf3c" | 28 | SRC_URI[sha256sum] = "dd51d3b942758a462afc7c8495930d25c93058e5319303247375183ad50164d2" |
| 30 | 29 | ||
| 31 | inherit autotools | 30 | inherit autotools |
| 32 | 31 | ||
