[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
10/41: gnu: openssl: Fix build on riscv64-linux.
From: |
guix-commits |
Subject: |
10/41: gnu: openssl: Fix build on riscv64-linux. |
Date: |
Thu, 9 Sep 2021 08:39:31 -0400 (EDT) |
efraim pushed a commit to branch wip-riscv
in repository guix.
commit 0d50d050610c349321b076aee4031a81b5447944
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 c73559c..24e3490 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
@@ -383,7 +386,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?
- 07/41: gnu: bdb: Fix building on riscv64-linux., (continued)
- 07/41: gnu: bdb: Fix building on riscv64-linux., guix-commits, 2021/09/09
- 12/41: gnu: openblas: Fix building on riscv64-linux., guix-commits, 2021/09/09
- 16/41: gnu: openblas-ilp64: Add riscv64-linux as a supported architecture., guix-commits, 2021/09/09
- 18/41: gnu: texlive-bin: Fix building on riscv64-linux., guix-commits, 2021/09/09
- 23/41: gnu: Use libunwind-next for riscv64-linux., guix-commits, 2021/09/09
- 27/41: gnu: mozjs-60: Add support for riscv64-linux., guix-commits, 2021/09/09
- 37/41: gnu: isc-dhcp: Fix building on riscv64-linux., guix-commits, 2021/09/09
- 38/41: build-system/meson: Fix cross-building to riscv64-linux., guix-commits, 2021/09/09
- 40/41: gnu: Add u-boot-sifive-unmatched-bootloader., guix-commits, 2021/09/09
- 41/41: system: Add riscv64 support., guix-commits, 2021/09/09
- 10/41: gnu: openssl: Fix build on riscv64-linux.,
guix-commits <=
- 22/41: gnu: Add libunwind-next., guix-commits, 2021/09/09
- 31/41: gnu: make-opensbi-package: Adjust installed files., guix-commits, 2021/09/09
- 32/41: gnu: u-boot-sifive-unmatched: Build with opensbi., guix-commits, 2021/09/09
- 39/41: gnu: gtk+: Remove some more failing tests., guix-commits, 2021/09/09
- 29/41: gnu: nss: Adjust make-flags for riscv64-linux., guix-commits, 2021/09/09
- 33/41: gnu: dtc: Build without valgrind on riscv64-linux., guix-commits, 2021/09/09
- 26/41: gnu: qemu: Skip some tests on riscv64-linux., guix-commits, 2021/09/09
- 34/41: gnu: php: Skip tests failing on riscv64-linux., guix-commits, 2021/09/09