[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/04: gnu: openssl: Fix build on riscv64-linux.
From: |
guix-commits |
Subject: |
04/04: gnu: openssl: Fix build on riscv64-linux. |
Date: |
Sun, 10 Oct 2021 09:25:54 -0400 (EDT) |
efraim pushed a commit to branch core-updates-frozen
in repository guix.
commit 3a73399ee86e56f615ef09118b0c27b9049bfe81
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Sun Aug 1 12:59:36 2021 +0300
gnu: openssl: Fix build on riscv64-linux.
* gnu/packages/tls.scm (openssl)[arguments]: On riscv64-linux use a
custom 'check phase to skip a failing test.
(target->openssl-target): Add case for riscv64-linux.
---
gnu/packages/tls.scm | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 9e2b441..7858f06 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -358,7 +358,10 @@ OpenSSL for TARGET."
((string-prefix? "powerpc64" target)
"linux-ppc64")
((string-prefix? "powerpc" target)
- "linux-ppc")))
+ "linux-ppc")
+ ((string-prefix? "riscv64" target)
+ ;; linux64-riscv64 isn't recognized until 3.0.0.
+ "linux-generic64")))
(define-public openssl
(package
@@ -404,7 +407,8 @@ OpenSSL for TARGET."
#~())
;; This test seems to be dependant on kernel features.
;; https://github.com/openssl/openssl/issues/12242
- #$@(if (target-arm?)
+ #$@(if (or (target-arm?)
+ (target-riscv64?))
#~((replace 'check
(lambda* (#:key tests? test-target #:allow-other-keys)
(when tests?