Message ID | 20200416083409.6230-1-mail@cbaines.net |
---|---|
State | Accepted |
Headers | show |
Series | [bug#40654] gnu: gnutls: Enable p11-kit. | expand |
Context | Check | Description |
---|---|---|
cbaines/comparison | success | View comparision |
cbaines/git branch | success | View Git branch |
cbaines/applying patch | success | View Laminar job |
retitle 40654 [PATCH core-updates] gnu: gnutls: Enable p11-kit. thanks On Thu, Apr 16, 2020 at 09:34:09AM +0100, Christopher Baines wrote: > 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-kit on > mips64el. > [inputs]: Include the p11-kit for all systems except mips64el. Chris, not sure if you noticed, but even though `guix refresh --list-dependent gnutls' lists only 2 packages, this change will trigger a core-updates-worthy rebuild due to the graft currently used for gnutls. I was under the impression that, as a convention, we mark such patches with [PATCH core-updates] in the subject, which made me uncertain as to whether you realized that this will rebuild the world. (Though, now that I think of it, testing this has probably required a significant amount of time...) Have a nice day! Jakub Kądziołka
Jakub Kądziołka <kuba@kadziolka.net> writes: > On Thu, Apr 16, 2020 at 09:34:09AM +0100, Christopher Baines wrote: >> 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-kit on >> mips64el. >> [inputs]: Include the p11-kit for all systems except mips64el. > > Chris, > > not sure if you noticed, but even though `guix refresh --list-dependent > gnutls' lists only 2 packages, this change will trigger a > core-updates-worthy rebuild due to the graft currently used for gnutls. Yeah, I noticed. This is a change I made when working on the QEMU smartcard support for GNOME Boxes [1], and I sent it as a separate patch as it does need handling differently. 1: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=40631 > I was under the impression that, as a convention, we mark such patches > with [PATCH core-updates] in the subject, which made me uncertain as to > whether you realized that this will rebuild the world. (Though, now that > I think of it, testing this has probably required a significant amount > of time...) I simply didn't know about that convention, thanks for letting me know :) Chris
Christopher Baines <mail@cbaines.net> writes: > 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-kit 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 specify > ;; 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=" > "$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/extensions") > > - ;; FIXME: Temporarily disable p11-kit support since it is not > - ;; 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") > + '()))) > > #: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) I've pushed this to core-updates now as 1c2889b1ce08e1f91193e237e03462dc74c63726.
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 specify ;; 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=" "$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/extensions") - ;; FIXME: Temporarily disable p11-kit support since it is not - ;; 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") + '()))) #: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)