From nobody Mon Jan 03 10:27:16 2022 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 5523A192D6FD; Mon, 3 Jan 2022 10:27:17 +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 4JSBkr5wb3z4px9; Mon, 3 Jan 2022 10:27:16 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 A623F23AF5; Mon, 3 Jan 2022 10:27:16 +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 203ARGf4085511; Mon, 3 Jan 2022 10:27:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 203ARGfI085510; Mon, 3 Jan 2022 10:27:16 GMT (envelope-from git) Date: Mon, 3 Jan 2022 10:27:16 GMT Message-Id: <202201031027.203ARGfI085510@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: =?utf-8?Q?Stefan E=C3=9Fer?= Subject: git: c3e195845242 - main - net/dpdk: fix build on -CURRENT 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: se X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c3e19584524281d37fe92868e5c3582fcd7d7d28 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641205636; 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=fq0I2ew+rmPnGeNzXVzZHx0ydv3Gy6/iPCWMibclV6I=; b=FZmbQ7Dh/JhxCVeW98i4Q/SV2LQa2nId3EMiqqn9NCBG5UAl0a41dLbxq1BJ9OO4VIobhF xY0VnN36TIGzF0BxMy0h1bdx85GkWq6V4YF9LCJtBMVo62vB1NHkR3RGQXPsIbepYxt3Hx JLLgUe8m8vjWn1gTHFUXKpVDl7xMBKNRfKDLTonmMCcocODrUO/bWbfQqgm+XVg/61f8+G jivzWvBa0brt7sciTfZJhdNCXLtdFhzBi8lOoHuYoawQcFkJd2FiTxUW7hFhog9+M3EhUh vSuECuQ6cQYEpr11e3OTjjGvmwi2Hu9YjMLWLDv6jb+dccYOp7vlQvQEfkFKJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641205636; a=rsa-sha256; cv=none; b=Qpl29MmusMGkPUsTxtVm899elmzJ1pNmp1jLihizZpyimkPNOHDxlRsopXJWEFAuoZV2BF 49EMRzr/aQY06VX0pkrKebv8xXF0zPuJU/sNOY87V0vqpgOOLfoEMrJSXkp7FZ1UL7R4OL SPFtO1c1HU/jrrKObDPmk3f1k6dH9i/vMyVfpG2TSXqQfPe2NWywBuYcbOnqxJLVtwiYuw aF6yjGw28wXiE6gfN9ctlb5ePcJZ+M8fTjuEJ+rZ1dMwRxJv08p61GRsqYXnCh7bJcAWPP N989Z9udER5yzg8gBsveRGpo+6kdqJfvjhHGgCU8XXr1KV0DzkoiawmfLt+7Cw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by se: URL: https://cgit.FreeBSD.org/ports/commit/?id=c3e19584524281d37fe92868e5c3582fcd7d7d28 commit c3e19584524281d37fe92868e5c3582fcd7d7d28 Author: Stefan Eßer AuthorDate: 2022-01-03 10:26:15 +0000 Commit: Stefan Eßer CommitDate: 2022-01-03 10:26:15 +0000 net/dpdk: fix build on -CURRENT The CPU_SET macros in -CURRENT have been made compatible with GLIBC. A simple test for the new signature of CPU_AND, CPU_OR, ... is the existence of a CPU_ALLOC macro. Approved by: portmgr (implicit) MFH: 2022Q1 --- ...h-lib_librte__eal_freebsd_eal_include_rte__os.h | 42 +++++++++++++++++++--- 1 file changed, 38 insertions(+), 4 deletions(-) diff --git a/net/dpdk/files/patch-lib_librte__eal_freebsd_eal_include_rte__os.h b/net/dpdk/files/patch-lib_librte__eal_freebsd_eal_include_rte__os.h index ede8d170de6e..6e63d49836ac 100644 --- a/net/dpdk/files/patch-lib_librte__eal_freebsd_eal_include_rte__os.h +++ b/net/dpdk/files/patch-lib_librte__eal_freebsd_eal_include_rte__os.h @@ -1,6 +1,38 @@ ---- lib/librte_eal/freebsd/eal/include/rte_os.h.orig 2020-01-03 12:22:03 UTC +--- lib/librte_eal/freebsd/eal/include/rte_os.h.orig 2021-03-17 16:43:15 UTC +++ lib/librte_eal/freebsd/eal/include/rte_os.h -@@ -29,6 +29,9 @@ typedef cpuset_t rte_cpuset_t; +@@ -14,8 +14,30 @@ + #include + + typedef cpuset_t rte_cpuset_t; +-#define RTE_CPU_AND(dst, src1, src2) do \ ++ ++/* FreeBSD 14 uses GLIBC compatible CPU_AND, CPU_OR, ... */ ++#ifdef CPU_ALLOC ++ ++#define RTE_CPU_AND(dst, src1, src2) CPU_AND(dst, src1, src2) ++#define RTE_CPU_OR(dst, src1, src2) CPU_OR(dst, src1, src2) ++#define RTE_CPU_FILL(set) do \ + { \ ++ unsigned int i; \ ++ CPU_ZERO(set); \ ++ for (i = 0; i < CPU_SETSIZE; i++) \ ++ CPU_SET(i, set); \ ++} while (0) ++#define RTE_CPU_NOT(dst, src) do \ ++{ \ ++ cpu_set_t tmp; \ ++ RTE_CPU_FILL(&tmp); \ ++ CPU_XOR(dst, &tmp, src); \ ++} while (0) ++ ++#else ++ ++#define RTE_CPU_AND(dst, src1, src2) do \ ++{ \ + cpuset_t tmp; \ + CPU_COPY(src1, &tmp); \ + CPU_AND(&tmp, src2); \ +@@ -29,6 +51,9 @@ typedef cpuset_t rte_cpuset_t; CPU_COPY(&tmp, dst); \ } while (0) #define RTE_CPU_FILL(set) CPU_FILL(set) @@ -10,7 +42,7 @@ #define RTE_CPU_NOT(dst, src) do \ { \ cpuset_t tmp; \ -@@ -36,5 +39,14 @@ typedef cpuset_t rte_cpuset_t; +@@ -36,5 +61,16 @@ typedef cpuset_t rte_cpuset_t; CPU_NAND(&tmp, src); \ CPU_COPY(&tmp, dst); \ } while (0) @@ -22,6 +54,8 @@ + CPU_ANDNOT(&tmp, src); \ + CPU_COPY(&tmp, dst); \ +} while (0) -+#endif ++#endif /* CPU_NAND */ ++ ++#endif /* CPU_ALLOC */ #endif /* _RTE_OS_H_ */