me
/
guix
Archived
1
0
Fork 0
Code

gnu: tls: Raise conditions from target->openssl-target. 

Rather than rasising generic errors.

* gnu/packages/tls.scm (target->openssl-target): Raise conditions rather than
generic errors.
(openssl-1.1): Call target->openssl-target with the package.

Change-Id: I13c63328cdf6bc177b20879805246ad94ff2665b
master
Christopher Baines 2024-05-16 16:06:04 +01:00
parent 4b85db10b1
commit 832eec2a74
No known key found for this signature in database
GPG Key ID: 5E28A33B0B84F577
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gnu/packages/tls.scm
View File

@ -84,7 +84,9 @@
#:use-module (gnu packages time) #:use-module (gnu packages time)
#:use-module (gnu packages version-control) #:use-module (gnu packages version-control)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (srfi srfi-1)) #:use-module (srfi srfi-1)
#:use-module (srfi srfi-34)
#:use-module (srfi srfi-35))
(define-public libtasn1 (define-public libtasn1
(package (package
@ -390,7 +392,7 @@ bindings that were formerly provided as part of GnuTLS.")
(modify-inputs (package-inputs guile-gnutls) (modify-inputs (package-inputs guile-gnutls)
(replace "guile" guile-2.2))))) (replace "guile" guile-2.2)))))
(define (target->openssl-target target) (define (target->openssl-target pkg target)
"Return the value to set CONFIGURE_TARGET_ARCH to when cross-compiling "Return the value to set CONFIGURE_TARGET_ARCH to when cross-compiling
OpenSSL for TARGET." OpenSSL for TARGET."
;; Keep this code outside the build code, ;; Keep this code outside the build code,
@ -411,7 +413,10 @@ OpenSSL for TARGET."
((target-linux? target) ((target-linux? target)
"linux") "linux")
(else (else
(error "unsupported openssl target kernel")))) (raise (condition
(&package-unsupported-target-error
(package pkg)
(target target)))))))
(arch (arch
(cond (cond
((target-x86-32? target) ((target-x86-32? target)
@ -438,7 +443,10 @@ OpenSSL for TARGET."
((target-64bit? target) ((target-64bit? target)
"generic64") "generic64")
(else (else
(error "unsupported openssl target architecture"))))) (raise (condition
(&package-unsupported-target-error
(package pkg)
(target target))))))))
(string-append kernel "-" arch)))) (string-append kernel "-" arch))))
(define-public openssl-1.1 (define-public openssl-1.1
@ -488,6 +496,7 @@ OpenSSL for TARGET."
(setenv "CROSS_COMPILE" (string-append target "-")) (setenv "CROSS_COMPILE" (string-append target "-"))
(setenv "CONFIGURE_TARGET_ARCH" (setenv "CONFIGURE_TARGET_ARCH"
#$(target->openssl-target #$(target->openssl-target
this-package
(%current-target-system)))))) (%current-target-system))))))
#~()) #~())
#$@(if (target-hurd?) #$@(if (target-hurd?)