git: 70243551106f - main - www/zola: another attempt to fix build on aarch64

From: Mikael Urankar <mikael_at_FreeBSD.org>
Date: Fri, 12 Jan 2024 17:02:04 UTC
The branch main has been updated by mikael:

URL: https://cgit.FreeBSD.org/ports/commit/?id=70243551106fcd18492e105361a962af1d9063b8

commit 70243551106fcd18492e105361a962af1d9063b8
Author:     Mikael Urankar <mikael@FreeBSD.org>
AuthorDate: 2024-01-10 13:57:58 +0000
Commit:     Mikael Urankar <mikael@FreeBSD.org>
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")),