Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 8 Jan 2024 17:10:25 GMT
From:      Mikael Urankar <mikael@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: dc97d0c1d15b - main - www/zola: Fix build on aarch64
Message-ID:  <202401081710.408HAPcJ080102@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by mikael:

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

commit dc97d0c1d15bdcfab309d36c45d20ec71cb11ed6
Author:     Mikael Urankar <mikael@FreeBSD.org>
AuthorDate: 2024-01-08 17:10:09 +0000
Commit:     Mikael Urankar <mikael@FreeBSD.org>
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 {
+     {



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401081710.408HAPcJ080102>