svn commit: r532942 - head/www/zola/files
Tobias Kortkamp
tobik at FreeBSD.org
Sat Apr 25 12:01:44 UTC 2020
Author: tobik
Date: Sat Apr 25 12:01:43 2020
New Revision: 532942
URL: https://svnweb.freebsd.org/changeset/ports/532942
Log:
www/zola: Unbreak on aarch64
The ring crate is missing aarch64 support on FreeBSD. Apply [1]
that adds support for it.
[1] https://github.com/briansmith/ring/pull/892
Added:
head/www/zola/files/patch-ring-aarch64
- copied, changed from r532914, head/security/cloak/files/patch-ring-aarch64
Copied and modified: head/www/zola/files/patch-ring-aarch64 (from r532914, head/security/cloak/files/patch-ring-aarch64)
==============================================================================
--- head/security/cloak/files/patch-ring-aarch64 Sat Apr 25 06:27:24 2020 (r532914, copy source)
+++ head/www/zola/files/patch-ring-aarch64 Sat Apr 25 12:01:43 2020 (r532942)
@@ -10,10 +10,10 @@ at the top of each file I changed.
src/cpu.rs | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
-diff --git cargo-crates/ring-0.14.6/src/cpu.rs cargo-crates/ring-0.14.6/src/cpu.rs
+diff --git cargo-crates/ring-0.16.11/src/cpu.rs cargo-crates/ring-0.16.11/src/cpu.rs
index 822aae4e3..bfd87c8de 100644
---- cargo-crates/ring-0.14.6/src/cpu.rs
-+++ cargo-crates/ring-0.14.6/src/cpu.rs
+--- cargo-crates/ring-0.16.11/src/cpu.rs
++++ cargo-crates/ring-0.16.11/src/cpu.rs
@@ -170,10 +170,10 @@ pub(crate) mod arm {
pub(crate) struct Feature {
@@ -68,10 +68,10 @@ at the top of each file I changed.
3 files changed, 69 insertions(+), 4 deletions(-)
create mode 100644 crypto/cpu-aarch64.c
-diff --git cargo-crates/ring-0.14.6/build.rs cargo-crates/ring-0.14.6/build.rs
+diff --git cargo-crates/ring-0.16.11/build.rs cargo-crates/ring-0.16.11/build.rs
index c6cb3a700..62b150170 100644
---- cargo-crates/ring-0.14.6/build.rs
-+++ cargo-crates/ring-0.14.6/build.rs
+--- cargo-crates/ring-0.16.11/build.rs
++++ cargo-crates/ring-0.16.11/build.rs
@@ -65,6 +65,7 @@ const RING_SRCS: &[(&[&str], &str)] = &[
(&[], "third_party/fiat/curve25519.c"),
@@ -80,11 +80,11 @@ index c6cb3a700..62b150170 100644
(&[X86], "crypto/fipsmodule/aes/asm/aes-586.pl"),
(&[X86], "crypto/fipsmodule/aes/asm/aesni-x86.pl"),
-diff --git cargo-crates/ring-0.14.6/crypto/cpu-aarch64.c cargo-crates/ring-0.14.6/crypto/cpu-aarch64.c
+diff --git cargo-crates/ring-0.16.11/crypto/cpu-aarch64.c cargo-crates/ring-0.16.11/crypto/cpu-aarch64.c
new file mode 100644
index 000000000..8bb537b78
--- /dev/null
-+++ cargo-crates/ring-0.14.6/crypto/cpu-aarch64.c
++++ cargo-crates/ring-0.16.11/crypto/cpu-aarch64.c
@@ -0,0 +1,32 @@
+// Copyright 2019 Greg V
+//
@@ -118,10 +118,10 @@ index 000000000..8bb537b78
+ __asm __volatile("mrs %0, ID_AA64ISAR0_EL1" : "=&r" (val));
+ return val;
+}
-diff --git cargo-crates/ring-0.14.6/src/cpu.rs cargo-crates/ring-0.14.6/src/cpu.rs
+diff --git cargo-crates/ring-0.16.11/src/cpu.rs cargo-crates/ring-0.16.11/src/cpu.rs
index bfd87c8de..d65d36a6a 100644
---- cargo-crates/ring-0.14.6/src/cpu.rs
-+++ cargo-crates/ring-0.14.6/src/cpu.rs
+--- cargo-crates/ring-0.16.11/src/cpu.rs
++++ cargo-crates/ring-0.16.11/src/cpu.rs
@@ -60,6 +60,11 @@ pub(crate) fn features() -> Features {
{
arm::fuchsia_setup();
More information about the svn-ports-all
mailing list