Attachment 234569 Details for Bug 264561 – net/pkt-gen: fix build on armv6, armv7, i386

[patch] net/pkt-gen: fix build on armv6, armv7, i386

0001-net-pkt-gen-fix-build-on-armv6-armv7-i386.patch (text/plain), 4.49 KB, created by Robert Clausecker on 2022-06-08 23:29:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Robert Clausecker

Created: 2022-06-08 23:29:49 UTC

Size: 4.49 KB

patch

obsolete

>From bc098232fff7bcf4616a2e2bae755b82259cd0ed Mon Sep 17 00:00:00 2001
>From: Robert Clausecker <fuz@fuz.su>
>Date: Thu, 9 Jun 2022 01:25:59 +0200
>Subject: [PATCH] net/pkt-gen: fix build on armv6, armv7, i386
>
> - patch out -Werror as per policy
> - fix the warning that previously failed the build
>---
> net/pkt-gen/Makefile                              |  3 ---
> net/pkt-gen/files/patch-apps_nmreplay_GNUmakefile | 12 ++++++++++++
> net/pkt-gen/files/patch-apps_nmreplay_nmreplay.c  |  4 ++--
> net/pkt-gen/files/patch-apps_pkt-gen_GNUmakefile  | 12 ++++++++++++
> net/pkt-gen/files/patch-apps_pkt-gen_pkt-gen.c    | 13 +++++++++++++
> net/pkt-gen/files/patch-libnetmap_GNUmakefile     | 11 +++++++++++
> 6 files changed, 50 insertions(+), 5 deletions(-)
> create mode 100644 net/pkt-gen/files/patch-apps_nmreplay_GNUmakefile
> create mode 100644 net/pkt-gen/files/patch-apps_pkt-gen_GNUmakefile
> create mode 100644 net/pkt-gen/files/patch-apps_pkt-gen_pkt-gen.c
> create mode 100644 net/pkt-gen/files/patch-libnetmap_GNUmakefile
>
>diff --git a/net/pkt-gen/Makefile b/net/pkt-gen/Makefile
>index 9116fb981608..8f356ac50910 100644
>--- a/net/pkt-gen/Makefile
>+++ b/net/pkt-gen/Makefile
>@@ -7,9 +7,6 @@ COMMENT=	Packet sink/source using the netmap API
> 
> LICENSE=	BSD2CLAUSE
> 
>-NOT_FOR_ARCHS=	i386
>-NOT_FOR_ARCHS_REASON=	Not supported on i386
>-
> USES=		gmake
> USE_GITHUB=	yes
> GH_ACCOUNT=	luigirizzo
>diff --git a/net/pkt-gen/files/patch-apps_nmreplay_GNUmakefile b/net/pkt-gen/files/patch-apps_nmreplay_GNUmakefile
>new file mode 100644
>index 000000000000..01f487791835
>--- /dev/null
>+++ b/net/pkt-gen/files/patch-apps_nmreplay_GNUmakefile
>@@ -0,0 +1,12 @@
>+--- apps/nmreplay/GNUmakefile.orig	2022-02-11 07:45:02 UTC
>++++ apps/nmreplay/GNUmakefile
>+@@ -10,7 +10,8 @@ VPATH = $(SRCDIR)/apps/nmreplay
>+ 
>+ NO_MAN=
>+ CFLAGS = -O2 # -pipe -g
>+-CFLAGS += -Werror -Wall -Wunused-function
>++CFLAGS += -Wall -Wunused-function
>++CFLAGS += -Wall -Wunused-function
>+ CFLAGS += -I $(SRCDIR)/sys -I $(SRCDIR)/apps/include -I $(SRCDIR)/libnetmap
>+ CFLAGS += -Wextra
>+ 
>diff --git a/net/pkt-gen/files/patch-apps_nmreplay_nmreplay.c b/net/pkt-gen/files/patch-apps_nmreplay_nmreplay.c
>index 435de25f65a6..7fa0b0b52463 100644
>--- a/net/pkt-gen/files/patch-apps_nmreplay_nmreplay.c
>+++ b/net/pkt-gen/files/patch-apps_nmreplay_nmreplay.c
>@@ -1,6 +1,6 @@
>---- apps/nmreplay/nmreplay.c.orig	2021-11-25 23:16:06 UTC
>+--- apps/nmreplay/nmreplay.c.orig	2022-02-11 07:45:02 UTC
> +++ apps/nmreplay/nmreplay.c
>-@@ -1280,7 +1280,7 @@ main(int argc, char **argv)
>+@@ -1273,7 +1273,7 @@ main(int argc, char **argv)
>  	D("exiting on abort");
>  	sleep(1);
>  
>diff --git a/net/pkt-gen/files/patch-apps_pkt-gen_GNUmakefile b/net/pkt-gen/files/patch-apps_pkt-gen_GNUmakefile
>new file mode 100644
>index 000000000000..f401d30bd9e8
>--- /dev/null
>+++ b/net/pkt-gen/files/patch-apps_pkt-gen_GNUmakefile
>@@ -0,0 +1,12 @@
>+--- apps/pkt-gen/GNUmakefile.orig	2022-02-11 07:45:02 UTC
>++++ apps/pkt-gen/GNUmakefile
>+@@ -10,7 +10,8 @@ VPATH = $(SRCDIR)/apps/pkt-gen
>+ 
>+ NO_MAN=
>+ CFLAGS = -O2 -pipe
>+-CFLAGS += -Werror -Wall -Wunused-function
>++CFLAGS += -Wall -Wunused-function
>++CFLAGS += -Wall -Wunused-function
>+ CFLAGS += -I $(SRCDIR)/sys -I $(SRCDIR)/apps/include -I $(SRCDIR)/libnetmap
>+ CFLAGS += -Wextra -Wno-address-of-packed-member
>+ 
>diff --git a/net/pkt-gen/files/patch-apps_pkt-gen_pkt-gen.c b/net/pkt-gen/files/patch-apps_pkt-gen_pkt-gen.c
>new file mode 100644
>index 000000000000..b059e6c79370
>--- /dev/null
>+++ b/net/pkt-gen/files/patch-apps_pkt-gen_pkt-gen.c
>@@ -0,0 +1,13 @@
>+--- apps/pkt-gen/pkt-gen.c.orig	2022-06-08 23:21:01 UTC
>++++ apps/pkt-gen/pkt-gen.c
>+@@ -3251,8 +3251,8 @@ out:
>+ 		g.tx_period.tv_nsec = g.tx_period.tv_nsec % 1000000000;
>+ 	}
>+ 	if (g.td_type == TD_TYPE_SENDER)
>+-	    D("Sending %d packets every  %ld.%09ld s",
>+-			g.burst, g.tx_period.tv_sec, g.tx_period.tv_nsec);
>++	    D("Sending %d packets every  %lld.%09ld s",
>++			g.burst, (long long)g.tx_period.tv_sec, g.tx_period.tv_nsec);
>+ 	/* Install ^C handler. */
>+ 	global_nthreads = g.nthreads;
>+ 	sigemptyset(&ss);
>diff --git a/net/pkt-gen/files/patch-libnetmap_GNUmakefile b/net/pkt-gen/files/patch-libnetmap_GNUmakefile
>new file mode 100644
>index 000000000000..ba04a18d3b2d
>--- /dev/null
>+++ b/net/pkt-gen/files/patch-libnetmap_GNUmakefile
>@@ -0,0 +1,11 @@
>+--- libnetmap/GNUmakefile.orig	2022-02-11 07:45:02 UTC
>++++ libnetmap/GNUmakefile
>+@@ -1,6 +1,7 @@
>+ SRCDIR ?= ../
>+ PREFIX ?= usr/local
>+-CFLAGS=-O2 -pipe -Wall -Werror
>++CFLAGS=-O2 -pipe -Wall
>++CFLAGS=-O2 -pipe -Wall
>+ CFLAGS +=-g
>+ CFLAGS += -I $(SRCDIR)/sys
>+ VPATH = $(SRCDIR)/libnetmap
>-- 
>2.35.2
>

Flags:

fuz: maintainer-approval+

Actions: View | Diff

Attachments on bug 264561: 234569