From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:46207) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOzzE-0001vg-RH for guix-patches@gnu.org; Thu, 16 Apr 2020 04:35:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jOzzD-0008Jb-Pw for guix-patches@gnu.org; Thu, 16 Apr 2020 04:35:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54187) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1jOzzD-0008It-Mq for guix-patches@gnu.org; Thu, 16 Apr 2020 04:35:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jOzzC-0002tv-Jj for guix-patches@gnu.org; Thu, 16 Apr 2020 04:35:02 -0400 Subject: [bug#40654] [PATCH] gnu: gnutls: Enable p11-kit. Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:46103) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jOzyQ-0001me-El for guix-patches@gnu.org; Thu, 16 Apr 2020 04:34:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jOzyP-00088B-3Z for guix-patches@gnu.org; Thu, 16 Apr 2020 04:34:14 -0400 Received: from mira.cbaines.net ([212.71.252.8]:54324) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1jOzyO-00087v-UI for guix-patches@gnu.org; Thu, 16 Apr 2020 04:34:13 -0400 Received: from localhost (unknown [46.237.160.17]) by mira.cbaines.net (Postfix) with ESMTPSA id AAEE827BBE1 for ; Thu, 16 Apr 2020 09:34:11 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id 0af077fa for ; Thu, 16 Apr 2020 08:34:09 +0000 (UTC) From: Christopher Baines Date: Thu, 16 Apr 2020 09:34:09 +0100 Message-Id: <20200416083409.6230-1-mail@cbaines.net> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 40654@debbugs.gnu.org Everywhere except mips64el, where a comment says it doesn't work. I can't= test as I can't build this on mips64el anyway. This change will enable running the tests for libcacard. * gnu/packages/tls.scm (gnutls)[arguments]: Only specify --without-p11-ki= t on mips64el. [inputs]: Include the p11-kit for all systems except mips64el. --- gnu/packages/tls.scm | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm index 3eb32fc27a..85f159a401 100644 --- a/gnu/packages/tls.scm +++ b/gnu/packages/tls.scm @@ -181,7 +181,7 @@ living in the same process.") `(; Ensure we don't keep a reference to this buggy software. #:disallowed-references (,net-tools) #:configure-flags - (list + (cons* ;; GnuTLS doesn't consult any environment variables to spec= ify ;; the location of the system-wide trust store. Instead it= has a ;; configure-time option. Unless specified, its configure = script @@ -202,9 +202,14 @@ living in the same process.") (string-append "--with-guile-extension-dir=3D" "$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/= extensions") =20 - ;; FIXME: Temporarily disable p11-kit support since it is n= ot - ;; working on mips64el. - "--without-p11-kit") + (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") + '()))) =20 #:phases (modify-phases %standard-phases (add-after @@ -227,7 +232,12 @@ living in the same process.") ("pkg-config" ,pkg-config) ("which" ,which))) (inputs - `(("guile" ,guile-2.2))) + `(("guile" ,guile-2.2) + ,@(let ((system (or (%current-target-system) + (%current-system)))) + (if (string-prefix? "mips64el" system) + '() + `(("p11-kit" ,p11-kit)))))) (propagated-inputs ;; These are all in the 'Requires.private' field of gnutls.pc. `(("libtasn1" ,libtasn1) --=20 2.26.0