From nobody Thu Apr 20 13:35:44 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q2JZS6yZpz464q2; Thu, 20 Apr 2023 13:35:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q2JZS3z2xz44Zc; Thu, 20 Apr 2023 13:35:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681997744; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZzQlt286Y4zlqs5wUAulHn9AenfhppTejetY6hMsavc=; b=pg3yD9LVuEBWzq6+731Ig+NzroXHlQlkA5I4YLf8fZvjOSsG4D5ftIi1pTpkgUIk51Dyng nPiU3ZTKcttTWFbLsgAWgw9VNOzqVysP8DOmIB/+FAun0/lYioEvSi49YXV2pfx+bfb64V PbTPNlGmr1AyqOtesjYJ7ZoL2b7gzvryhfGbW3EoLQXcQ5Jm4gXaBY0LbqHS2YU47ZweOF p3SjGaIMkMU+pwiKOYS4qzY0rgyKjxJl9Lqai8vxfb0cBWq4SVANwMf292ASEcQTBoYnBD BHtVACH0UFH2v3v1/wd3M3u9Teo5vFKOeDr24w3xW42WMRcxf+9PyD7WNBAzxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681997744; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZzQlt286Y4zlqs5wUAulHn9AenfhppTejetY6hMsavc=; b=KqI93nB3puJO4sbavXOBvHEA8NWiSFehXUI8oqMtEJngsUURlG2G1hptVRcA6WzwfUPjoy +y3z2YMqgxLkH2swTzQElEVi3ylJ8+g+eWY36RgR4eaL1191RMAg0jXcXPuDVZcD+/tbwV bA4Ter5AW82DXJka9IH+VonY8P1IBnVK/lWGvtKlk4a75jU/TP3WTTi0E+wCPVGaLikNkU 7FgHKPoIZQJ9qoYLgZSk8tx/tKyiuMZCGWyoc0WydkEJ9Yr/CupYKFf0gtww5yBMoN8zbz //utMalbNIXRMccbBmKzDfS4TPY4deXAlRWZzFjdWicOO8+a6mlz3UOgYf/FAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681997744; a=rsa-sha256; cv=none; b=xRB7ziXwzYs05EcZgi6U7FkmatnrH5GC1c/16Gn5PdlNfk7ixyATWZIxx9QUAcCJoszARK wbFRkCN4X3DCfR4iT6anQ0SZq4Cq0YYq/lqqQDrWKHhPtCXl2QmO5BT+dtEJ9oPNeGKTs1 gBJKH3DzcBE9PkHN6qOQs/YYEspfXoJq9rdiTMz1uWC2N7Q2mDPgTUNDzWmElR0XqlJF5w UEuQzp7bmzN6lmnr2sqP29fL8uHXp7CbUceNWpkrRHCwdu9W2RO5lHHZgI8a2p3y5qaUJK P0TuGoqqLf/4Ob5A1vBntm8cnMe2DoIPp4NSsKG0Q5Ju3hwH/3OaCpj4i3ttsw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q2JZS32vvzfrW; Thu, 20 Apr 2023 13:35:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33KDZi07081583; Thu, 20 Apr 2023 13:35:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33KDZiu9081582; Thu, 20 Apr 2023 13:35:44 GMT (envelope-from git) Date: Thu, 20 Apr 2023 13:35:44 GMT Message-Id: <202304201335.33KDZiu9081582@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: 289d41817be3 - main - net/pkt-gen: fix on 32 bit platforms (again) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 289d41817be3eb14823fb9b550dd0e1186f654b8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=289d41817be3eb14823fb9b550dd0e1186f654b8 commit 289d41817be3eb14823fb9b550dd0e1186f654b8 Author: Robert Clausecker AuthorDate: 2023-04-19 12:10:57 +0000 Commit: Robert Clausecker CommitDate: 2023-04-20 11:49:22 +0000 net/pkt-gen: fix on 32 bit platforms (again) Exorcise -Werror for the third time. Re-add patches needed to build on 32 bit platforms. Please don't remove patches without understanding them first. Fixes: 9305cd3f9321bfba95479b2b2a15c7639a790383 PR: 270440 See also: PR 264561, 230623 Approved by: portmgr (build fix blanket) --- net/pkt-gen/Makefile | 4 +--- net/pkt-gen/files/patch-apps_nmreplay_GNUmakefile | 12 ++++++++++++ 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 +++++++++++ 5 files changed, 49 insertions(+), 3 deletions(-) diff --git a/net/pkt-gen/Makefile b/net/pkt-gen/Makefile index e02534d447e2..35bc8e6570a1 100644 --- a/net/pkt-gen/Makefile +++ b/net/pkt-gen/Makefile @@ -1,5 +1,6 @@ PORTNAME= pkt-gen PORTVERSION= g2023.03.22 +PORTREVISION= 1 CATEGORIES= net MAINTAINER= olivier@FreeBSD.org @@ -8,9 +9,6 @@ WWW= https://github.com/luigirizzo/netmap LICENSE= BSD2CLAUSE -NOT_FOR_ARCHS= armv6 armv7 i386 mips powerpc -NOT_FOR_ARCHS_REASON= build error with time_t type on 32bit platforms - 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_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