diff mbox series

[OpenWrt-Devel] nftables: Fix compilation with uClibc-ng

Message ID 20190501170810.5230-1-rosenp@gmail.com
State Accepted
Delegated to: Petr Štetiar
Headers show
Series [OpenWrt-Devel] nftables: Fix compilation with uClibc-ng | expand

Commit Message

Rosen Penev May 1, 2019, 5:08 p.m. UTC
Missing header for va_list.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 https://downloads.openwrt.org/snapshots/faillogs/arc_arc700/base/nftables/compile.txt
 actually shows the exact same change.
 package/network/utils/nftables/Makefile                |  2 +-
 .../network/utils/nftables/patches/010-uclibc-ng.patch | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)
 create mode 100644 package/network/utils/nftables/patches/010-uclibc-ng.patch

Comments

Petr Štetiar May 3, 2019, 11:50 a.m. UTC | #1
Rosen Penev <rosenp@gmail.com> [2019-05-01 10:08:10]:

Hi,

> Missing header for va_list.

shouldn't this go through upstream first? Thanks.

-- ynezz
Rosen Penev May 3, 2019, 6:49 p.m. UTC | #2
On Fri, May 3, 2019 at 4:50 AM Petr Štetiar <ynezz@true.cz> wrote:
>
> Rosen Penev <rosenp@gmail.com> [2019-05-01 10:08:10]:
>
> Hi,
>
> > Missing header for va_list.
>
> shouldn't this go through upstream first? Thanks.
Sent
>
> -- ynezz
Rosen Penev May 5, 2019, 10:24 p.m. UTC | #3
On Fri, May 3, 2019 at 11:49 AM, Rosen Penev <rosenp@gmail.com> wrote:
> On Fri, May 3, 2019 at 4:50 AM Petr Štetiar <ynezz@true.cz> wrote:
>> 
>>  Rosen Penev <rosenp@gmail.com> [2019-05-01 10:08:10]:
>> 
>>  Hi,
>> 
>>  > Missing header for va_list.
>> 
>>  shouldn't this go through upstream first? Thanks.
> Sent
This was applied upstream.
> 
>> 
>>  -- ynezz
Petr Štetiar May 6, 2019, 7:44 a.m. UTC | #4
Rosen Penev <rosenp@gmail.com> [2019-05-05 15:24:19]:

> On Fri, May 3, 2019 at 11:49 AM, Rosen Penev <rosenp@gmail.com> wrote:
> > On Fri, May 3, 2019 at 4:50 AM Petr Štetiar <ynezz@true.cz> wrote:
> > > 
> > >  Rosen Penev <rosenp@gmail.com> [2019-05-01 10:08:10]:
> > > 
> > >  Hi,
> > > 
> > >  > Missing header for va_list.
> > > 
> > >  shouldn't this go through upstream first? Thanks.
> > Sent
> This was applied upstream.

Nice, thanks. I've updated the content of the patch to match that in upstream
and merged that into my staging tree.

1. https://git.openwrt.org/9efc6ad195

-- ynezz
Rosen Penev Aug. 13, 2019, 10:29 p.m. UTC | #5
On Mon, May 6, 2019 at 12:44 AM Petr Štetiar <ynezz@true.cz> wrote:
>
> Rosen Penev <rosenp@gmail.com> [2019-05-05 15:24:19]:
>
> > On Fri, May 3, 2019 at 11:49 AM, Rosen Penev <rosenp@gmail.com> wrote:
> > > On Fri, May 3, 2019 at 4:50 AM Petr Štetiar <ynezz@true.cz> wrote:
> > > >
> > > >  Rosen Penev <rosenp@gmail.com> [2019-05-01 10:08:10]:
> > > >
> > > >  Hi,
> > > >
> > > >  > Missing header for va_list.
> > > >
> > > >  shouldn't this go through upstream first? Thanks.
> > > Sent
> > This was applied upstream.
>
> Nice, thanks. I've updated the content of the patch to match that in upstream
> and merged that into my staging tree.
>
> 1. https://git.openwrt.org/9efc6ad195
>
> -- ynezz
Can you backport this to 18.06? It fails there as well:
https://downloads.openwrt.org/releases/faillogs-18.06/arc_arc700/base/nftables/compile.txt
diff mbox series

Patch

diff --git a/package/network/utils/nftables/Makefile b/package/network/utils/nftables/Makefile
index d1e995116d..d4f91a2c89 100644
--- a/package/network/utils/nftables/Makefile
+++ b/package/network/utils/nftables/Makefile
@@ -8,7 +8,7 @@  include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nftables
 PKG_VERSION:=0.9.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://netfilter.org/projects/$(PKG_NAME)/files
diff --git a/package/network/utils/nftables/patches/010-uclibc-ng.patch b/package/network/utils/nftables/patches/010-uclibc-ng.patch
new file mode 100644
index 0000000000..4de1d1c324
--- /dev/null
+++ b/package/network/utils/nftables/patches/010-uclibc-ng.patch
@@ -0,0 +1,10 @@ 
+--- a/include/gmputil.h
++++ b/include/gmputil.h
+@@ -7,6 +7,7 @@
+ #include <gmp.h>
+ #else
+ #include <mini-gmp.h>
++#include <stdarg.h>
+ #include <stdio.h>
+ /* mini-gmp doesn't come with gmp_vfprintf, so we use our own minimal variant */
+ extern int mpz_vfprintf(FILE *fp, const char *format, va_list args);