diff options
| author | Steven Barth <cyrus@openwrt.org> | 2013-03-06 17:05:34 +0000 |
|---|---|---|
| committer | Steven Barth <cyrus@openwrt.org> | 2013-03-06 17:05:34 +0000 |
| commit | 9779b0b88c0efefa7fffb5fa86c708349c883c8d (patch) | |
| tree | 5c494c6669383fda50b71285aa3b996170232875 /package/network/utils/iptables/patches/030-no-libnfnetlink.patch | |
| parent | 9f4b9328e7341db29fc593c44dd4f5d5988a74c4 (diff) | |
| download | mtk-20170518-9779b0b88c0efefa7fffb5fa86c708349c883c8d.zip mtk-20170518-9779b0b88c0efefa7fffb5fa86c708349c883c8d.tar.gz mtk-20170518-9779b0b88c0efefa7fffb5fa86c708349c883c8d.tar.bz2 | |
iptables: redo update to 1.4.18 with old linking-behaviour
SVN-Revision: 35896
Diffstat (limited to 'package/network/utils/iptables/patches/030-no-libnfnetlink.patch')
| -rw-r--r-- | package/network/utils/iptables/patches/030-no-libnfnetlink.patch | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/package/network/utils/iptables/patches/030-no-libnfnetlink.patch b/package/network/utils/iptables/patches/030-no-libnfnetlink.patch index cda9a72..f795291 100644 --- a/package/network/utils/iptables/patches/030-no-libnfnetlink.patch +++ b/package/network/utils/iptables/patches/030-no-libnfnetlink.patch @@ -1,6 +1,6 @@ --- a/configure +++ b/configure -@@ -10917,75 +10917,7 @@ $as_echo "no" >&6; } +@@ -12173,77 +12173,7 @@ $as_echo "no" >&6; } fi fi @@ -18,6 +18,7 @@ - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_libnfnetlink_CFLAGS=`$PKG_CONFIG --cflags "libnfnetlink >= 1.0" 2>/dev/null` +- test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi @@ -34,6 +35,7 @@ - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_libnfnetlink_LIBS=`$PKG_CONFIG --libs "libnfnetlink >= 1.0" 2>/dev/null` +- test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi @@ -53,9 +55,9 @@ - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then -- libnfnetlink_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnfnetlink >= 1.0" 2>&1` +- libnfnetlink_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libnfnetlink >= 1.0" 2>&1` - else -- libnfnetlink_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnfnetlink >= 1.0" 2>&1` +- libnfnetlink_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libnfnetlink >= 1.0" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$libnfnetlink_PKG_ERRORS" >&5 @@ -79,7 +81,7 @@ else --- a/configure.ac +++ b/configure.ac -@@ -79,9 +79,7 @@ AM_CONDITIONAL([ENABLE_LARGEFILE], [test +@@ -89,9 +89,7 @@ AM_CONDITIONAL([ENABLE_LARGEFILE], [test AM_CONDITIONAL([ENABLE_DEVEL], [test "$enable_devel" = "yes"]) AM_CONDITIONAL([ENABLE_LIBIPQ], [test "$enable_libipq" = "yes"]) @@ -88,5 +90,5 @@ -AM_CONDITIONAL([HAVE_LIBNFNETLINK], [test "$nfnetlink" = 1]) +AM_CONDITIONAL([HAVE_LIBNFNETLINK], [false]) - regular_CFLAGS="${largefile_cflags} \ - -D_REENTRANT -Wall -Waggregate-return -Wmissing-declarations \ + regular_CFLAGS="-Wall -Waggregate-return -Wmissing-declarations \ + -Wmissing-prototypes -Wredundant-decls -Wshadow -Wstrict-prototypes \ |