From nobody Mon Jan 03 10:27:15 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 D361C192D8A9; Mon, 3 Jan 2022 10:27:15 +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 4JSBkq48QGz4pjp; Mon, 3 Jan 2022 10:27:15 +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 6E6F523876; Mon, 3 Jan 2022 10:27:15 +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 203ARFmo085483; Mon, 3 Jan 2022 10:27:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 203ARF9k085482; Mon, 3 Jan 2022 10:27:15 GMT (envelope-from git) Date: Mon, 3 Jan 2022 10:27:15 GMT Message-Id: <202201031027.203ARF9k085482@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: 1b13427e48ed - main - net/dpdk-20.11: fix build on -CURRENT 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: se X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1b13427e48ed448f68a7d67a694da31b2d57104d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641205635; 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=2cq//UbkdFax+Du6skEnDDyD22n3D2vDYDIN9qFWfIg=; b=Suvy8W8cTAW1o8pED8EgiSeHes7nEZy9IlQ7ItG9vHGG2ZA9gi4oRqS0yVMkxuGx7S51aM btJNdQN6bPYiIcJmiwG9uhRihnnHUbdjIZBh9ne3HNd03WF0gsNhAG2M9jxTTewT206llK QF7enVPIQYX+i7/tvsO7IxgeLXeB9hCnKnfcMaf6XmPFS+9iP6sCslzMSFNUqd0bXHpUyu MhuX0mtf3Pdt16QzK3MDrcgHTHoJMQMf0mLO6k6w56cxaY4yewy9n9crDavU8ef4SzgqPD olGJ+AfPnnIh7iCKOdWKYs9KdTXQL3rYljGuoDmh5RbRmNjOks9S0ziMzqdUwg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641205635; a=rsa-sha256; cv=none; b=AHm6E+1sl6WSU7F1ciBlnKjO4oox5wvkXS60PeQnR3uFD/fUTsr/aBf0xUdh0lXPr73alG kPts0RmThhIwTXVLesGSj8m1B++HCqvB7JPLqJFSQ8v3Nf5TnUnPdXZLNkE0VrXFZBgCQf FW1UnMovaQca9HZGXRDFWlTOmNQmPk5baZuH5yGvgckQW/9RYNaienCdxxrenUDDWi4l4t WTCjHoSqe4HjIbAYaCeiUsz9o+au/rHGaW+K5GV8heX7Kalcp7FnI+5rGp3H1sqOGkRvM/ VBOLsF0TDEJVszk9mYfL8wWxR6UvlNTKmcHCQbX08lF35RVdwFoqMzEdiN9iwA== 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=1b13427e48ed448f68a7d67a694da31b2d57104d commit 1b13427e48ed448f68a7d67a694da31b2d57104d Author: Stefan Eßer AuthorDate: 2022-01-03 10:21:10 +0000 Commit: Stefan Eßer CommitDate: 2022-01-03 10:21:10 +0000 net/dpdk-20.11: 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 --- ...patch-lib_librte__eal_freebsd_include_rte__os.h | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/net/dpdk-20.11/files/patch-lib_librte__eal_freebsd_include_rte__os.h b/net/dpdk-20.11/files/patch-lib_librte__eal_freebsd_include_rte__os.h new file mode 100644 index 000000000000..c48d4a55c9a2 --- /dev/null +++ b/net/dpdk-20.11/files/patch-lib_librte__eal_freebsd_include_rte__os.h @@ -0,0 +1,41 @@ +--- lib/librte_eal/freebsd/include/rte_os.h.orig 2021-03-08 17:40:08 UTC ++++ lib/librte_eal/freebsd/include/rte_os.h +@@ -14,6 +14,28 @@ + #include + + typedef cpuset_t rte_cpuset_t; ++ ++/* 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; \ +@@ -47,6 +69,8 @@ typedef cpuset_t rte_cpuset_t; + CPU_ANDNOT(&tmp, src); \ + CPU_COPY(&tmp, dst); \ + } while (0) +-#endif ++#endif /* CPU_NAND */ ++ ++#endif /* CPU_ALLOC */ + + #endif /* _RTE_OS_H_ */