guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

10/24: gnu: openssl: Fix build on riscv64-linux.


From: guix-commits
Subject: 10/24: gnu: openssl: Fix build on riscv64-linux.
Date: Fri, 20 Aug 2021 10:20:37 -0400 (EDT)

efraim pushed a commit to branch wip-riscv
in repository guix.

commit 0b87639639568186f5f71b19ed494d114c4bea4a
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 277d79e..fda7a63 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -337,7 +337,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
@@ -382,7 +385,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-riscv?))
               #~((replace 'check
                    (lambda* (#:key tests? test-target #:allow-other-keys)
                      (when tests?



reply via email to

[Prev in Thread] Current Thread [Next in Thread]