Date: Tue, 28 Jun 2022 21:19:52 GMT From: Olivier Cochard <olivier@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: aaa201ef81ee - main - net/pkt-gen: fix build on armv6, armv7, i386 Message-ID: <202206282119.25SLJqO8012754@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/ports/commit/?id=aaa201ef81ee4b302c46cd09160b583339c19747 commit aaa201ef81ee4b302c46cd09160b583339c19747 Author: Olivier Cochard <olivier@FreeBSD.org> AuthorDate: 2022-06-28 21:15:26 +0000 Commit: Olivier Cochard <olivier@FreeBSD.org> CommitDate: 2022-06-28 21:15:26 +0000 net/pkt-gen: fix build on armv6, armv7, i386 PR: 264561 Reported by: Robert Clausecker <fuz@fuz.su> --- 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(-) 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202206282119.25SLJqO8012754>