[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
10/42: gnu: openssl: Fix build on riscv64-linux.
From: |
guix-commits |
Subject: |
10/42: gnu: openssl: Fix build on riscv64-linux. |
Date: |
Fri, 8 Oct 2021 04:19:59 -0400 (EDT) |
efraim pushed a commit to branch wip-riscv
in repository guix.
commit afd112f32002577711c58dddbf48bb68af990b73
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?
- branch wip-riscv created (now 9715fad), guix-commits, 2021/10/08
- 02/42: gnu: bootstrap: Add support for riscv64-linux., guix-commits, 2021/10/08
- 05/42: gnu: guile: Fix building on riscv64-linux., guix-commits, 2021/10/08
- 03/42: gnu: gcc-boot0: Use libstdc++-boot0-gcc7 on riscv64-linux., guix-commits, 2021/10/08
- 01/42: utils: Define 'target-riscv64?' predicate., guix-commits, 2021/10/08
- 06/42: gnu: %final-inputs: Add implied gcc:lib input., guix-commits, 2021/10/08
- 04/42: gnu: %boot3-inputs: Add missing input., guix-commits, 2021/10/08
- 08/42: gnu: elfutils: Fix building on riscv64-linux., guix-commits, 2021/10/08
- 07/42: gnu: bdb: Fix building on riscv64-linux., guix-commits, 2021/10/08
- 09/42: gnu: pcre: Fix building on riscv64-linux., guix-commits, 2021/10/08
- 10/42: gnu: openssl: Fix build on riscv64-linux.,
guix-commits <=
- 11/42: gnu: libtool: Fix test suite on riscv64-linux., guix-commits, 2021/10/08
- 12/42: gnu: openblas: Fix building on riscv64-linux., guix-commits, 2021/10/08
- 13/42: gnu: mesa: Add support for riscv64-linux., guix-commits, 2021/10/08
- 14/42: gnu: pcre2: Fix building on riscv64-linux., guix-commits, 2021/10/08
- 15/42: gnu: icu4c: Skip tests on riscv64-linux., guix-commits, 2021/10/08
- 16/42: gnu: openblas-ilp64: Add riscv64-linux as a supported architecture., guix-commits, 2021/10/08
- 18/42: gnu: texlive-bin: Fix building on riscv64-linux., guix-commits, 2021/10/08
- 21/42: gnu: texlive-latex-base: Skip JIT formats on riscv64-linux., guix-commits, 2021/10/08
- 19/42: gnu: lz4: Build on riscv64-linux without valgrind., guix-commits, 2021/10/08
- 23/42: gnu: Use libunwind-next for riscv64-linux., guix-commits, 2021/10/08