From nobody Fri Jan 12 17:02:04 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 4TBSWJ2v0vz579l6; Fri, 12 Jan 2024 17:02:04 +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 4TBSWJ2SYnz4Z3c; Fri, 12 Jan 2024 17:02:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705078924; 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=QKOWUv8T0HnDMCD+G6Utok22ewRy5ZLUHjp0pkVj18k=; b=JeGLM0QiW71KOPKi9qD/iRkmvFk+1KkN2YSEcFfZC//D3xHBztD9iDAAt4QwUa4iSfRfON ogfriRCjX0mAAw+NCRe+rAYjsNQufF5hSrmrJnKG4hNEfdz8f1aaa184jWnQIgOkqg5HFR o8crZqWfSLgQQGQn94gfOr0DB8b0z3CDkR0RbbWpLajV4cm9ji03xrM6wLzzTfTIvU2HSE 4u7oaZJHZNM3DgvOVfHgVdp6APSGHSEeSSt7LKaFMcRNAB//fHQYfPfybijUuAYvpFCUXk C8cJUT308P4zVWd3A/uLha+zxpiI8U2K6SDlqlvwsKU7nysgIsJyyUH60FGBsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705078924; 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=QKOWUv8T0HnDMCD+G6Utok22ewRy5ZLUHjp0pkVj18k=; b=rRshCmSxsXRi9r8wxqygdoL8YxLmf/RB2InRWwO9ak8mSrirKGKmvSW7FjnB+RkfNCFoVa OOGU91WgoDqEtlEVxpxyyPvw2D7jYOQYV+cnYPOuljP/+F1jDK48m+H174yhaqR+TBvOPE Gn4v0cL3OGFasad2nrZwcr89Jm/wlloebkCyfoZ3SkPAUrokOn+TB1XSYyfKBf4Ohlnfm+ G+05T3pWJXe3JDGn+aHwTNdnZxn0PHev8qnWgwcaZ2D8zcgjI/x+xVAi4A1Vz5ncaFLet1 CL6jQ3z0pz3DdPTsgiWGieCumrdIJ6EBHrZjFyfG6rFkGC5P6w8A8V3qddT7UQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705078924; a=rsa-sha256; cv=none; b=evj0aIcNwZac9fzUKO0+FQzouF2KT2zPtL7YpdQ5L+g1Se7lx6efzk51PIOH5mb2clSLph sbtBwEMKy5ougjULGBC79oSoXDng/6wIT0Xyw2fwivoM+aYWYjVSP1epwhfcHKdIhR+GDD cXVJ8I37SrpxK+ELC2GDF5sFK2N5sFfQuDlNu/Te3sHtSKSer3C4LvZVA21maQDbuzUwHZ zj9zZyd9p1RbbwXawCyOhJIEibckeh4JtmwS11M1lASN4kXWVKTdoyzxLMgCKAlScMYA4s JWRitepMj1WznqDT/7ePon4xdSVLfFCHjSdjl5gY89Tud8XfNH7v19AJBTeu7g== 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 4TBSWJ1XK5z19CQ; Fri, 12 Jan 2024 17:02:04 +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 40CH24LP010237; Fri, 12 Jan 2024 17:02:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40CH24PD010234; Fri, 12 Jan 2024 17:02:04 GMT (envelope-from git) Date: Fri, 12 Jan 2024 17:02:04 GMT Message-Id: <202401121702.40CH24PD010234@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: 70243551106f - main - www/zola: another attempt to 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: 70243551106fcd18492e105361a962af1d9063b8 Auto-Submitted: auto-generated The branch main has been updated by mikael: URL: https://cgit.FreeBSD.org/ports/commit/?id=70243551106fcd18492e105361a962af1d9063b8 commit 70243551106fcd18492e105361a962af1d9063b8 Author: Mikael Urankar AuthorDate: 2024-01-10 13:57:58 +0000 Commit: Mikael Urankar CommitDate: 2024-01-12 17:01:53 +0000 www/zola: another attempt to fix build on aarch64 It's still broken for some users even though I can't reproduce on my hardware. Reported by: olgeni --- www/zola/files/patch-ring-aarch64 | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/www/zola/files/patch-ring-aarch64 b/www/zola/files/patch-ring-aarch64 index f891b01e8706..f1ef5d9eec10 100644 --- a/www/zola/files/patch-ring-aarch64 +++ b/www/zola/files/patch-ring-aarch64 @@ -101,13 +101,19 @@ 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 --} +@@ -156,6 +201,7 @@ fn detect_features() -> u32 { + #[cfg(all( + any(target_arch = "aarch64", target_arch = "arm"), + not(any( ++ target_os = "freebsd", + target_os = "android", + target_os = "fuchsia", + all(target_os = "linux", not(target_env = "uclibc")), +@@ -216,6 +262,7 @@ impl Feature { - macro_rules! features { - { + #[cfg(all( + any( ++ target_os = "freebsd", + target_os = "android", + target_os = "fuchsia", + all(target_os = "linux", not(target_env = "uclibc")),