[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?
- 02/24: gnu: bootstrap: Add support for riscv64-linux., (continued)
- 02/24: gnu: bootstrap: Add support for riscv64-linux., guix-commits, 2021/08/20
- 06/24: gnu: %final-inputs: Add implied gcc:lib input., guix-commits, 2021/08/20
- 07/24: gnu: bdb: Fix building on riscv64-linux., guix-commits, 2021/08/20
- 08/24: gnu: elfutils: Fix building on riscv64-linux., guix-commits, 2021/08/20
- 12/24: gnu: openblas: Fix building on riscv64-linux., guix-commits, 2021/08/20
- 17/24: gnu: openlibm: Remove riscv64-linux from supported systems., guix-commits, 2021/08/20
- 03/24: gnu: gcc-boot0: Use libstdc++-boot0-gcc7 on riscv64-linux., guix-commits, 2021/08/20
- 04/24: gnu: %boot3-inputs: Add missing input., guix-commits, 2021/08/20
- 05/24: gnu: guile: Fix building on riscv64-linux., guix-commits, 2021/08/20
- 09/24: gnu: pcre: Fix building on riscv64-linux., guix-commits, 2021/08/20
- 10/24: gnu: openssl: Fix build on riscv64-linux.,
guix-commits <=
- 15/24: gnu: icu4c: Skip tests on riscv64-linux., guix-commits, 2021/08/20
- 11/24: gnu: libtool: Fix test suite on riscv64-linux., guix-commits, 2021/08/20
- 14/24: gnu: pcre2: Fix building on riscv64-linux., guix-commits, 2021/08/20
- 16/24: gnu: openblas-ilp64: Add riscv64-linux as a supported architecture., guix-commits, 2021/08/20
- 18/24: gnu: texlive-bin: Fix building on riscv64-linux., guix-commits, 2021/08/20
- 20/24: gnu: lapack: Fix building on riscv64-linux., guix-commits, 2021/08/20
- 22/24: gnu: Add libunwind-next., guix-commits, 2021/08/20
- 23/24: gnu: Use libunwind-next for riscv64-linux., guix-commits, 2021/08/20
- 24/24: gnu: libaio: Fix test suite on riscv64-linux., guix-commits, 2021/08/20
- 19/24: gnu: lz4: Build on riscv64-linux without valgrind., guix-commits, 2021/08/20