guix-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[bug#75026] [PATCH core-updates 3/7] gnu: gnutls: Streamline mips64el co


From: Maxim Cournoyer
Subject: [bug#75026] [PATCH core-updates 3/7] gnu: gnutls: Streamline mips64el conditionals.
Date: Mon, 23 Dec 2024 01:01:01 +0900

* gnu/packages/tls.scm (gnutls) [arguments]: Use target-mips64el? procedure in
 #:configure-flags.
[propagated-inputs]: Likewise.

Change-Id: Ia4b603ef57cebe78df1d3e40222fe9c49d9ee8cc
---
 gnu/packages/tls.scm | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index c0efb66d96..90d6ad5c95 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -232,15 +232,12 @@ (define-public gnutls
               ;; fallback, and users have to configure each program
               ;; independently.  This seems suboptimal.
               "--with-default-trust-store-dir=/etc/ssl/certs"
-
-              (let ((system #$(or (%current-target-system)
-                                  (%current-system))))
-                (if (string-prefix? "mips64el" system)
-                    (list
-                     ;; FIXME: Temporarily disable p11-kit support since it is
-                     ;; not working on mips64el.
-                     "--without-p11-kit")
-                    '())))
+              (if #$(target-mips64el?)
+                  (list
+                   ;; FIXME: Temporarily disable p11-kit support since it is
+                   ;; not working on mips64el.
+                   "--without-p11-kit")
+                  '()))
            #:make-flags
            #~(list (string-append
                     "XFAIL_TESTS="
@@ -287,11 +284,9 @@ (define-public gnutls
     (propagated-inputs
      ;; These are all in the 'Requires.private' field of gnutls.pc.
      (append (list libtasn1 libidn2 nettle zlib)
-             (let ((system (or (%current-target-system)
-                               (%current-system))))
-               (if (string-prefix? "mips64el" system)
-                   '()
-                   (list p11-kit)))))
+             (if (target-mips64el?)
+                 '()
+                 (list p11-kit))))
     (home-page "https://gnutls.org";)
     (synopsis "Transport layer security library")
     (description
-- 
2.46.0






reply via email to

[Prev in Thread] Current Thread [Next in Thread]