diff options
| author | Christopher Baines <mail@cbaines.net> | 2024-05-16 16:06:04 +0100 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2024-07-15 22:34:24 +0100 |
| commit | 832eec2a74c18559e996ffc9dd862cc9d08ea125 (patch) | |
| tree | be475e9dd1dde18efce79ad0211d6e8b5f5e65d6 /gnu/packages/tls.scm | |
| parent | 4b85db10b1b45c6ef7b41b9c338eddf87e12b373 (diff) | |
| download | guix-832eec2a74c18559e996ffc9dd862cc9d08ea125.tar.gz guix-832eec2a74c18559e996ffc9dd862cc9d08ea125.zip | |
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
Diffstat (limited to 'gnu/packages/tls.scm')
| -rw-r--r-- | gnu/packages/tls.scm | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 760b917768..fdc003731d 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -84,7 +84,9 @@ #:use-module (gnu packages time) #:use-module (gnu packages version-control) #: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 (package @@ -390,7 +392,7 @@ bindings that were formerly provided as part of GnuTLS.") (modify-inputs (package-inputs guile-gnutls) (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 OpenSSL for TARGET." ;; Keep this code outside the build code, @@ -411,7 +413,10 @@ OpenSSL for TARGET." ((target-linux? target) "linux") (else - (error "unsupported openssl target kernel")))) + (raise (condition + (&package-unsupported-target-error + (package pkg) + (target target))))))) (arch (cond ((target-x86-32? target) @@ -438,7 +443,10 @@ OpenSSL for TARGET." ((target-64bit? target) "generic64") (else - (error "unsupported openssl target architecture"))))) + (raise (condition + (&package-unsupported-target-error + (package pkg) + (target target)))))))) (string-append kernel "-" arch)))) (define-public openssl-1.1 @@ -488,6 +496,7 @@ OpenSSL for TARGET." (setenv "CROSS_COMPILE" (string-append target "-")) (setenv "CONFIGURE_TARGET_ARCH" #$(target->openssl-target + this-package (%current-target-system)))))) #~()) #$@(if (target-hurd?) |