From nobody Thu Jan 23 00:16:13 2025 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 4YdhLk2zgqz5lJHc; Thu, 23 Jan 2025 00:16:14 +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 4YdhLk13Jwz3mMS; Thu, 23 Jan 2025 00:16:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737591374; 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=a+g4scN4qkZMV2jVo4qOTDTbFVZhJ1X9z449l/KC9gY=; b=GlGQ1hqIrTFj8as+xVaV6CeAjRjiOUJqB43wwtcsvG/4anAFKEsbvLKOh2+lb8/ooFdsj4 orxfct2YfSEcyNW6larLLUGXACKk7YBynzxgVmV1dQONd+OpF0QoR4sTFxaPZGK0oe7Bcu dH0ZRm7oUHGcg0LayFdZeaFuYJ7QAgkRVtDKNHRyiySNnSIoE6oYBrUbNRPXQothLdfefJ 2WTbKqf2RvRiFjKY4uAE7do133Z6ZZdHac+x+x/dQBe58t13td303uv9sGNPAutjipNU5M pq5qN1W9Q2iQrwLKKkPcp851a4G7AHkF0gnV95IE6lnzwySBGneOGjCfIFzNmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737591374; 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=a+g4scN4qkZMV2jVo4qOTDTbFVZhJ1X9z449l/KC9gY=; b=cy9S1p+qFccvTBW/Wqnbb2NqsR/m+gcsUVGXeNmLrnZHdSZPFPT9nstHlaIq3S92RC5Z7n OIFLsmYSjc6g8p30qq/uNNrdum/2s8kxGWDtdCget/5YGkqQgpik6t/QM8RtgEoM3jFyTj 0KBn/Uwc8XaKHACNUrPf1AqOpXX7fee+UFMhcddlQ02JVgmAH/dnkGoEMoVUtNtpFA34Jv OuR3yoJwcMqxwADaMKuy5t+ckunAx94a3Z0RgV/GR/Sdx1eG442PDxRLTboPx/lycgneDT V5RBKTMzWLrf86b4lKoPvmT/51gVcoVmJyKe9oncxP/xAXVMV3b+FBJsPQbkEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737591374; a=rsa-sha256; cv=none; b=saXJBzG2ra2xpikcnDy1MU3OUkhabNWKQi+Mgd271FK2zRCz9VzwMdBRzuuqfFDFFbnG1n boo8oSzrkrYSlcUXyJqLhUQqiAERKRhmfUULzcXD/FmWzYw7rvuI1zckR9OEpJviU6/t4b hAlMT9HgSJSLJ93dWtrCOQVxQThpf5rZ1wcoPD9CR58v84EWDa12IDJYGrOSc277ZBQth3 nnH8SuBmtpXa3015q3xyQsWDQ2bm233jCCvYVr31CwGYme6Eu3jRx4q4GoJjCYb6FtI7VB Zrhpjtz6S9srpa1n++Fhap/2O5Pj69V2mFVtugxoKkEKCreq3YRzsamsCcDIFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YdhLk0H2bzwq; Thu, 23 Jan 2025 00:16:14 +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 50N0GDcV089557; Thu, 23 Jan 2025 00:16:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50N0GDkl089554; Thu, 23 Jan 2025 00:16:13 GMT (envelope-from git) Date: Thu, 23 Jan 2025 00:16:13 GMT Message-Id: <202501230016.50N0GDkl089554@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 91e4d1cd9596 - main - emulators/rpcs3: unbreak aarch64 build after a036b104b872 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 91e4d1cd95968d2db3e84d73592e8e71a73b077a Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=91e4d1cd95968d2db3e84d73592e8e71a73b077a commit 91e4d1cd95968d2db3e84d73592e8e71a73b077a Author: Jan Beich AuthorDate: 2025-01-22 22:35:39 +0000 Commit: Jan Beich CommitDate: 2025-01-23 00:15:01 +0000 emulators/rpcs3: unbreak aarch64 build after a036b104b872 3rdparty/wolfssl/wolfssl/wolfcrypt/src/cpuid.c:262:28: error: use of undeclared identifier 'CPUID_AARCH64_FEAT_PMULL' if (features & CPUID_AARCH64_FEAT_PMULL) ^ Reported by: pkg-fallout --- emulators/rpcs3/files/patch-wolfssl | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/emulators/rpcs3/files/patch-wolfssl b/emulators/rpcs3/files/patch-wolfssl new file mode 100644 index 000000000000..c736ccef7dc1 --- /dev/null +++ b/emulators/rpcs3/files/patch-wolfssl @@ -0,0 +1,16 @@ +https://github.com/wolfSSL/wolfssl/commit/197a7e0ba386 + +--- 3rdparty/wolfssl/wolfssl/wolfcrypt/src/cpuid.c.orig 2024-12-31 17:58:22 UTC ++++ 3rdparty/wolfssl/wolfssl/wolfcrypt/src/cpuid.c +@@ -259,8 +259,10 @@ + + if (features & CPUID_AARCH64_FEAT_AES) + cpuid_flags |= CPUID_AES; +- if (features & CPUID_AARCH64_FEAT_PMULL) ++ if (features & CPUID_AARCH64_FEAT_AES_PMULL) { ++ cpuid_flags |= CPUID_AES; + cpuid_flags |= CPUID_PMULL; ++ } + if (features & CPUID_AARCH64_FEAT_SHA256) + cpuid_flags |= CPUID_SHA256; + if (features & CPUID_AARCH64_FEAT_SHA256_512)