diff options
| author | Steven Barth <cyrus@openwrt.org> | 2014-12-16 09:28:59 +0000 |
|---|---|---|
| committer | Steven Barth <cyrus@openwrt.org> | 2014-12-16 09:28:59 +0000 |
| commit | 5628648f87ff6d0ed86a459d2f10e47ffd2d8471 (patch) | |
| tree | 7c397162e7b6da46944c068bde60a95e448a420f /package/network/utils/nftables/patches/101-build-restore-disable-debug.patch | |
| parent | c6c0c275bcfab69111b93ff9b5caa99331ee8653 (diff) | |
| download | mtk-20170518-5628648f87ff6d0ed86a459d2f10e47ffd2d8471.zip mtk-20170518-5628648f87ff6d0ed86a459d2f10e47ffd2d8471.tar.gz mtk-20170518-5628648f87ff6d0ed86a459d2f10e47ffd2d8471.tar.bz2 | |
nftables: bump to release 0.4, cleanup our patches
Signed-off-by: Steven Barth <steven@midlink.org>
SVN-Revision: 43730
Diffstat (limited to 'package/network/utils/nftables/patches/101-build-restore-disable-debug.patch')
| -rw-r--r-- | package/network/utils/nftables/patches/101-build-restore-disable-debug.patch | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/package/network/utils/nftables/patches/101-build-restore-disable-debug.patch b/package/network/utils/nftables/patches/101-build-restore-disable-debug.patch deleted file mode 100644 index ca035c3..0000000 --- a/package/network/utils/nftables/patches/101-build-restore-disable-debug.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 3c30c8b6fd2ea715eb4bdaa5a6d4e1623f28834c Mon Sep 17 00:00:00 2001 -From: Pablo Neira Ayuso <pablo@netfilter.org> -Date: Sun, 14 Dec 2014 21:04:49 +0100 -Subject: [PATCH 1/3] build: restore --disable-debug - -Fix fallout from the automake conversion. Display after configuration -if it is enabled or not. - -Reported-by: Steven Barth <cyrus@openwrt.org> -Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org> ---- - configure.ac | 10 ++++++---- - src/Makefile.am | 5 ++++- - 2 files changed, 10 insertions(+), 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 1525ac4..b55b2b1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -24,9 +24,10 @@ AC_DEFINE([_STDC_FORMAT_MACROS], [], [printf-style format macros]) - - AC_ARG_ENABLE([debug], - AS_HELP_STRING([--enable-debug], [Enable debugging]), -- [CONFIG_DEBUG="$(echo $enableval | cut -b1)"], -- [CONFIG_DEBUG="y"]) --AC_SUBST([CONFIG_DEBUG]) -+ [with_debug=no], -+ [with_debug=yes]) -+AC_SUBST(with_debug) -+AM_CONDITIONAL([BUILD_DEBUG], [test "x$with_debug" != xno]) - - # Checks for programs. - AC_PROG_CC -@@ -128,4 +129,5 @@ AC_OUTPUT - - echo " - nft configuration: -- cli support: ${with_cli}" -+ cli support: ${with_cli} -+ enable debugging: ${with_debug}" -diff --git a/src/Makefile.am b/src/Makefile.am -index d53c347..378424d 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -3,8 +3,11 @@ sbin_PROGRAMS = nft - CLEANFILES = scanner.c parser_bison.c - - AM_CPPFLAGS = -I$(top_srcdir)/include --AM_CPPFLAGS += -DDEFAULT_INCLUDE_PATH="\"${sysconfdir}\"" -DDEBUG \ -+AM_CPPFLAGS += -DDEFAULT_INCLUDE_PATH="\"${sysconfdir}\"" \ - ${LIBMNL_CFLAGS} ${LIBNFTNL_CFLAGS} -+if BUILD_DEBUG -+AM_CPPFLAGS += -g -DDEBUG -+endif - - AM_CFLAGS = -Wall \ - -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations \ --- -2.1.3 - |