From nobody Tue Jun 28 21:19:52 2022 X-Original-To: dev-commits-ports-all@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 7BA8386E1B8; Tue, 28 Jun 2022 21:19:53 +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 4LXctd29FBz4XHv; Tue, 28 Jun 2022 21:19:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656451193; 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=Us0A1wD8l4gMlnAhJb8W2nKJFCNF80fw1mSlNyjQtE8=; b=LvviQ2WoNFEei4/eZ0p1cjgRhZYLJlU4WLLpqhYTJYgJ0zGs3OweXbVswXT5qM8sQWuuI1 ZYU9coWp4Wk34KOXjPOTYqQmOU45RyRIwK/b2lFNl4KQUesJ79LayePn0EgT+g0YHBqkaz Z2qElj2a8lyfaUeAZSQRev1oLPOP821/NJdQwdxp+fkZrd0b92nJV/Q14qwCzNRnPJo+uI Un/cmOqN1BbRGO5CSPLT6T+CsyQ+wUar1y8LmI9H1Wd7BHAGHvEvzkVlz2HaSR6KeYMHns oTrHYKgu1FKErVTuaB2mYljcgmd0JM6JehPYNJNirJsq/Per8yNkWUUEFIeUTQ== 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 E3B1224569; Tue, 28 Jun 2022 21:19:52 +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 25SLJqWI012755; Tue, 28 Jun 2022 21:19:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25SLJqO8012754; Tue, 28 Jun 2022 21:19:52 GMT (envelope-from git) Date: Tue, 28 Jun 2022 21:19:52 GMT Message-Id: <202206282119.25SLJqO8012754@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Olivier Cochard Subject: git: aaa201ef81ee - main - net/pkt-gen: fix build on armv6, armv7, i386 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: olivier X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: aaa201ef81ee4b302c46cd09160b583339c19747 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656451193; 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=Us0A1wD8l4gMlnAhJb8W2nKJFCNF80fw1mSlNyjQtE8=; b=SvXrDXPGT27IJHk6s3owj7Jifn+OitDTwuh2wrnR9MHBkoP/DQy5UjDecyrfHgtBac8B5M f+Xda9Wy7bQuhxyTjcprqgeJWOap76braleIFJYUq4ILFqDsoBQn8ZtPMZMG2aEdlLJsz9 8waQPyen6mM/8khRv0evBm4sYH6fFXw+kFoJR7Je+NpSmEdtCQ16rZfZWFPSGZ46PUK+sU nREwfIhQ6b1yiw+GY9aozcdLgDW833I1Y16liuaCfVFHy+h+UbbIYzuCc+Xa5WvGgxnPsv PV5QjTJT0ABypP5CfK0m+MbJnfvg7L8OK4L6u1FQTAVKwJQn8or0Lzgh3A1G5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656451193; a=rsa-sha256; cv=none; b=kSwoz2ug2opWaBIQCtcmNDpNCkuMzaDMxaJLQxYi9eAfbGn58a03lwvb5zwLhgt8LMQzzD lNPFytFTpkO92VbU1EV7E0vBQTd1C47+94WLiZVIyqzU2djZ1tmzPRwcznJtID4NHLmyUM CrLossNAITDTRfjJDMGmd6sIcw59QNqwRgol3NaXOEL3O0Cdg06bJTw7bbp4GxqIIZLqwX oPWsAupdLfSZKMUxi5a57dS8FIr3keXe1bGIClKPS5h9RNRY8z1hXzip5LLloHEvIK7vkR SFja62GJpYAJB3AejQEiMEwgOxk7lzuLtWN/F+8byveV00bUyOqUC6I6ARAmSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by olivier: URL: https://cgit.FreeBSD.org/ports/commit/?id=aaa201ef81ee4b302c46cd09160b583339c19747 commit aaa201ef81ee4b302c46cd09160b583339c19747 Author: Olivier Cochard AuthorDate: 2022-06-28 21:15:26 +0000 Commit: Olivier Cochard CommitDate: 2022-06-28 21:15:26 +0000 net/pkt-gen: fix build on armv6, armv7, i386 PR: 264561 Reported by: Robert Clausecker --- 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