From nobody Mon Oct 21 09:37:12 2024 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 4XX9FN4kCMz5Ylgd; Mon, 21 Oct 2024 09:37:12 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XX9FN2NPDz4nNK; Mon, 21 Oct 2024 09:37:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729503432; 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=WaRM9QJ14csrnnfwRYGBty6zVbo/8gSfQh11Y5VXcRM=; b=GqjUmiiqlXaGc7lTx3DVTXCCJc09sQnumE+nTkeQBp3CTNs3GDnlUMm57CLAmuDCXi76YW 4U7/l6FONWIcIXPiaJEb7PN2J1c08S1x5fX7H9+pIBwrCqnXgvO8XJLYtCrbx8xiN4IEhp fym70CkmsFPouTKh5fZxpV7oyEVN6nSWU+tLWS/o4whqfwXvTXE91Ngzy+nGam9qYelNnF PHUZ4LD97N4l8DcROnlcaWazGeciWez0/OlG+PjJeSZWvr6c4VrdMW7FtrCGYJYvbRtEDW 6YS0nnLG1FSqyidVxbyUJv+5JqDwlc6h+3gpXf3sbxOF/TS06K9BAJQV4AcFvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1729503432; 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=WaRM9QJ14csrnnfwRYGBty6zVbo/8gSfQh11Y5VXcRM=; b=EyVR2qB9oGIuTAnYyXDVkq05hnv32DKqN2zdPE/VsTaQmu/N0/x1YGS3R0hEt1MRbMIfwE /weBAAb7VR7m1xsjmrqccr6yBr6ha7FRKCsBEDYjqWuzuY3KtkRZZmtFLLB2NGA3w3JBzg N9gzx0RRFh7cHq+cIKkWx6d2sNRM1/Vqv0EctEbd9MVjIxPatIEz4wgGfXYEb8zDhu+m3X wp2CQIYaayIqjWr3mTKrUBCStJJZE0nlooDMuGnwijWe+AGLjRcpOFtZK7A3sMCOR7Smz3 6dt38jhS/XIBcPr+/hWIxh6zd7p0HLHw3MylH75HVjswzcGCobYZHbOqPzcQAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1729503432; a=rsa-sha256; cv=none; b=QZhRhSZOtpg/11C8176tDedL2s4NAfEEa+FjMnw5Sq/BNjocr1yuIM8iCLhbrJGA+3XmIc cD20a6SbDBGj7bf7hOpDhbtyzrN0yuh496fwsaTZGzq/9QcnZpBgnpwhMDRI1dInlIfohb PqqaDPAmbICduk31gmuTuRDv+Y0omc8yE859fWbgxGXQpG08eRrFUh2NC3xxk1QbXPVcAm KyxrmSxKV64Tp28PSBSJxO4JTGmciL4B+IsHadGZAob2tV5bHzh1VYBtRnSuHJ/INVjFIW LaUHGpVs/W0RYy8f7ii3hrV6PBQO/aGHU/foUFxq0dPcDWRx/7NGL4KWvUwoaQ== 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 4XX9FN1sGNzQ2s; Mon, 21 Oct 2024 09:37:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 49L9bCmI032823; Mon, 21 Oct 2024 09:37:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 49L9bCBB032820; Mon, 21 Oct 2024 09:37:12 GMT (envelope-from git) Date: Mon, 21 Oct 2024 09:37:12 GMT Message-Id: <202410210937.49L9bCBB032820@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: dfeab5d38571 - main - net-mgmt/ipfixcol2: port to aarch64 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-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: dfeab5d38571c9b6bc90c0c23c948d55d0659caf Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=dfeab5d38571c9b6bc90c0c23c948d55d0659caf commit dfeab5d38571c9b6bc90c0c23c948d55d0659caf Author: Robert Clausecker AuthorDate: 2024-10-15 16:39:08 +0000 Commit: Robert Clausecker CommitDate: 2024-10-21 09:36:01 +0000 net-mgmt/ipfixcol2: port to aarch64 - use sse2neon to implement SSE intrinsics on AArch64 Approved by: zarychtam@plan-b.pwste.edu.pl (maintainer) PR: 282113 --- net-mgmt/ipfixcol2/Makefile | 7 ++++--- .../patch-src_tools_fdsdump_src_aggregator_hashTable.cpp | 14 ++++++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/net-mgmt/ipfixcol2/Makefile b/net-mgmt/ipfixcol2/Makefile index 59aca4ede7a7..38ff4557deae 100644 --- a/net-mgmt/ipfixcol2/Makefile +++ b/net-mgmt/ipfixcol2/Makefile @@ -10,15 +10,16 @@ WWW= https://github.com/CESNET/ipfixcol2 LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE -ONLY_FOR_ARCHS= amd64 +ONLY_FOR_ARCHS= aarch64 amd64 ONLY_FOR_ARCHS_REASON= Require SSE2 and static_assert(sizeof(uint64_t) == sizeof(time_t), "Assumed that time_t is uint64_t, but it's not") -BUILD_DEPENDS= rst2man:textproc/py-docutils +BUILD_DEPENDS_aarch64= ${LOCALBASE}/include/sse2neon.h:devel/sse2neon +BUILD_DEPENDS= rst2man:textproc/py-docutils ${BUILD_DEPENDS_${ARCH}} LIB_DEPENDS= librdkafka.so:net/librdkafka \ libepoll-shim.so:devel/libepoll-shim \ libfds.so:net-mgmt/libfds -USES= cmake localbase:ldflags pkgconfig +USES= cmake:testing localbase:ldflags pkgconfig USE_GITHUB= yes GH_ACCOUNT= CESNET USE_RC_SUBR= ${PORTNAME} diff --git a/net-mgmt/ipfixcol2/files/patch-src_tools_fdsdump_src_aggregator_hashTable.cpp b/net-mgmt/ipfixcol2/files/patch-src_tools_fdsdump_src_aggregator_hashTable.cpp new file mode 100644 index 000000000000..250fa05e6475 --- /dev/null +++ b/net-mgmt/ipfixcol2/files/patch-src_tools_fdsdump_src_aggregator_hashTable.cpp @@ -0,0 +1,14 @@ +--- src/tools/fdsdump/src/aggregator/hashTable.cpp.orig 2024-10-15 16:33:15 UTC ++++ src/tools/fdsdump/src/aggregator/hashTable.cpp +@@ -6,7 +6,11 @@ + + #define XXH_INLINE_ALL + ++#if defined(__arm__) || defined(__aarch64__) ++#include ++#else + #include ++#endif + + #include "hashTable.hpp" + #include "3rd_party/xxhash/xxhash.h"