From nobody Mon Jan 08 17:10:25 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 4T80tn6rZ4z567Fc; Mon, 8 Jan 2024 17:10:25 +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 4T80tn48Bfz4jR5; Mon, 8 Jan 2024 17:10:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704733825; 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=c+bA0lqeiv1mTQandEBA5dnkWjlNBl2i9iLCI5NPcpw=; b=wJpAbO8PVkSsZDpuMMNfdJj3q5ThbwaK033+3BeyXvSDERLcXB+X7wwvpfRm7hpKZnq4SP Fmyw/DcqiZxzDW8C5JtNGTkQ6kJ3ZeJFnoDD4hK8Qtf7ivhE85wbF9AcWSSiX0aeX05NG6 KbH17nAsPvCtsHA4hFmJlWWXog/WRPVm/fNSSMrUNB8agHiJ+GIcs9YAW9n6THy0s0k4YH fi+jlc9odclU6OLnT8pLyN/kGHlydzmSQp7IVnCsx8d3PIF07XK8nZK6WwAERq5ytHQzO3 4pArLNJHKE2yq+XdQX8YQu55/zbfzWUwtYvpa3qH1ZowY1U+8jbyuPv67BffiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704733825; 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=c+bA0lqeiv1mTQandEBA5dnkWjlNBl2i9iLCI5NPcpw=; b=NS6KpHNoBxn1z6t6aO6d8FCPLUY4myA1OIK9NpLbERQ78HtTVNpb71sMWwaCFY8pUk/8IL hvS/6+dITtDeW1eSjkEsoCnAjK6/KQwdlyEGbvj4CY7dv/42ZIPKZ4i4yM8rALEYtHqnXw YDyEePVk5CWpDHHXJC9BQ6jSP7oM1DDtIxLwqrQK082GZv8H38/0ss+K/2ItAbidwV8DE+ N794+TpShMWGESPofDK279dTvNFSG+t85dkrz2A1vjqMoScxI059UjcknSLt51Ac83D+jm 3q7yR4S85HQ6KGdATyDqI8fDf0AanD0j9qBIQfh7U1XypQUvmaB5D0vX60DOhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704733825; a=rsa-sha256; cv=none; b=H8dWxbS8XoMIjKVI+H2PQvB7uH6y8OMZKXHrg9usdXpnnjROqmoUAnn0B9mKlwjy8RxUBe p819snGSnn3KhnINg/EmVhvPFEH05cEmaLRd6QNXNWfHK/x53xkK33HQGK99CYN/cDmAmP k/aGczRykl1QSDNJ4ASxLC7JBEi3O2Arq6JaAtIULBJe3hjGc/UuPkkfwnpI9VrtB4jmhG lNTq85fD/aHHA4B2QzgV3z2MLCvMKCehXpeUAa2LaUXra1OiuxnI6auKeJ3V5rFNeRoSob stlCTJGGH6Gn+4SaxA3dU8pUNjVJQNnHxOZAWQlyyHHv+9OcvgTanFbC9iTlJw== 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 4T80tn3CVjzFsM; Mon, 8 Jan 2024 17:10:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 408HAP9J080105; Mon, 8 Jan 2024 17:10:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 408HAPcJ080102; Mon, 8 Jan 2024 17:10:25 GMT (envelope-from git) Date: Mon, 8 Jan 2024 17:10:25 GMT Message-Id: <202401081710.408HAPcJ080102@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikael Urankar Subject: git: dc97d0c1d15b - main - www/zola: Fix build on 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: 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: mikael X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dc97d0c1d15bdcfab309d36c45d20ec71cb11ed6 Auto-Submitted: auto-generated The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=dc97d0c1d15bdcfab309d36c45d20ec71cb11ed6 commit dc97d0c1d15bdcfab309d36c45d20ec71cb11ed6 Author: Mikael Urankar AuthorDate: 2024-01-08 17:10:09 +0000 Commit: Mikael Urankar CommitDate: 2024-01-08 17:10:09 +0000 www/zola: Fix build on aarch64 --- www/zola/files/patch-ring-aarch64 | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/www/zola/files/patch-ring-aarch64 b/www/zola/files/patch-ring-aarch64 index ac92f109961d..f891b01e8706 100644 --- a/www/zola/files/patch-ring-aarch64 +++ b/www/zola/files/patch-ring-aarch64 @@ -72,7 +72,7 @@ // We assume NEON is available on AARCH64 because it is a required // feature. #[cfg(target_arch = "aarch64")] -@@ -67,11 +97,26 @@ fn detect_features() -> u32 { +@@ -67,12 +97,27 @@ fn detect_features() -> u32 { #[cfg(target_arch = "arm")] const OFFSET: c_ulong = 0; @@ -85,7 +85,7 @@ const AT_HWCAP2: c_ulong = 26; unsafe { getauxval(AT_HWCAP2) } }; -+ + + #[cfg(target_os = "freebsd")] + { + const AT_HWCAP2: c_int = 26; @@ -97,6 +97,17 @@ + ); + }; + } - ++ const HWCAP_AES: c_ulong = 1 << 0 + OFFSET; const HWCAP_PMULL: c_ulong = 1 << 1 + OFFSET; + const HWCAP_SHA2: c_ulong = 1 << 3 + OFFSET; +@@ -162,9 +207,6 @@ fn detect_features() -> u32 { + target_os = "windows" + )) + ))] +-fn detect_features() -> u32 { +- 0 +-} + + macro_rules! features { + {