efraim pushed a commit to branch core-updates
in repository guix.
commit 39ec7b86c0730f07da01f008f85287c05efde1bc
Author: Efraim Flashner <[email protected]>
AuthorDate: Tue Apr 18 11:53:16 2023 +0300
gnu: openssl: Update cross-configure target for riscv64-linux .
* gnu/packages/tls.scm (target->openssl-target): When building for
riscv64-linux use architecture specific configurations.
---
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 d41efe23b0..a5154df573 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -5,7 +5,7 @@
;;; Copyright © 2013, 2015 Andreas Enge <[email protected]>
;;; Copyright © 2015 David Thompson <[email protected]>
;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Leo Famulari
<[email protected]>
-;;; Copyright © 2016, 2017, 2019, 2021, 2022 Efraim Flashner
<[email protected]>
+;;; Copyright © 2016, 2017, 2019, 2021-2023 Efraim Flashner
<[email protected]>
;;; Copyright © 2016, 2017, 2018 Nikita <[email protected]>
;;; Copyright © 2016 Hartmut Goebel <[email protected]>
;;; Copyright © 2017 Ricardo Wurmus <[email protected]>
@@ -401,6 +401,9 @@ OpenSSL for TARGET."
(let ((kernel
(cond ((target-hurd? target)
"hurd")
+ ((and (target-linux? target)
+ (target-riscv64? target))
+ "linux64")
((target-linux? target)
"linux")
(else
@@ -424,8 +427,9 @@ OpenSSL for TARGET."
((and (target-powerpc? target)
(target-64bit? target))
"ppc64")
+ ((target-riscv64? target)
+ "riscv64")
((target-64bit? target)
- ;; linux64-riscv64 isn't recognized until 3.0.0.
"generic64")
(else
(error "unsupported openssl target architecture")))))