bug#63077: [PATCH] gnu: gnutls: skip examples on mingw.

bug#63077: [PATCH] gnu: gnutls: skip examples on mingw.

[Vivien Kraus via Bug reports for GNU Guix]

* gnu/packages/tls.scm (gnutls): Skip the doc/examples subdir on mingw,
because the gnulib modules are not correct.
---
 gnu/packages/tls.scm | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 6d7cff41b0..9e16b04702 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -253,6 +253,15 @@ (define-public gnutls
                    (substitute* "tests/fastopen.sh"
                      (("^unset RETCODE")
                       "exit 77\n"))))   ;skip
+               #$@(if (target-mingw?)
+                      #~((add-after 'unpack 'skip-doc-examples
+                           ;; The examples in doc do not link to correct
+                           ;; gnulib modules.
+                           (lambda _
+                             (substitute* "doc/Makefile.in"
+                               (("SUBDIRS = examples")
+                                "SUBDIRS =")))))
+                      #~())
                #$@(if (target-ppc32?)
                       ;; https://gitlab.com/gnutls/gnutls/-/issues/1354
                       ;; Extend the test timeout from the default of 20 * 1000

base-commit: e287a0e402ee15eefa80c2804e487025507fe3b1
-- 
2.39.2

bug#63077: [PATCH] gnu: gnutls: skip examples on mingw.

[Maxim Cournoyer]

Hi Vivien,

Vivien Kraus <vivien@planete-kraus.eu> writes:

> * gnu/packages/tls.scm (gnutls): Skip the doc/examples subdir on mingw,
> because the gnulib modules are not correct.
> ---
>  gnu/packages/tls.scm | 9 +++++++++
>  1 file changed, 9 insertions(+)
>
> diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
> index 6d7cff41b0..9e16b04702 100644
> --- a/gnu/packages/tls.scm
> +++ b/gnu/packages/tls.scm
> @@ -253,6 +253,15 @@ (define-public gnutls
>                     (substitute* "tests/fastopen.sh"
>                       (("^unset RETCODE")
>                        "exit 77\n"))))   ;skip
> +               #$@(if (target-mingw?)
> +                      #~((add-after 'unpack 'skip-doc-examples
> +                           ;; The examples in doc do not link to correct
> +                           ;; gnulib modules.
> +                           (lambda _
> +                             (substitute* "doc/Makefile.in"
> +                               (("SUBDIRS = examples")
> +                                "SUBDIRS =")))))
> +                      #~())

Did you report it upstream?  Perhaps they'd know how to properly fix it.

-- 
Thanks,
Maxim

bug#63077: [PATCH] gnu: gnutls: skip examples on mingw.

[Simon Tournier]

Hi,

On ven., 05 janv. 2024 at 13:06, Maxim Cournoyer <maxim.cournoyer@gmail.com> wrote:
> Vivien Kraus <vivien@planete-kraus.eu> writes:
>
>> * gnu/packages/tls.scm (gnutls): Skip the doc/examples subdir on mingw,
>> because the gnulib modules are not correct.
>> ---
>>  gnu/packages/tls.scm | 9 +++++++++
>>  1 file changed, 9 insertions(+)
>>
>> diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
>> index 6d7cff41b0..9e16b04702 100644
>> --- a/gnu/packages/tls.scm
>> +++ b/gnu/packages/tls.scm
>> @@ -253,6 +253,15 @@ (define-public gnutls
>>                     (substitute* "tests/fastopen.sh"
>>                       (("^unset RETCODE")
>>                        "exit 77\n"))))   ;skip
>> +               #$@(if (target-mingw?)
>> +                      #~((add-after 'unpack 'skip-doc-examples
>> +                           ;; The examples in doc do not link to correct
>> +                           ;; gnulib modules.
>> +                           (lambda _
>> +                             (substitute* "doc/Makefile.in"
>> +                               (("SUBDIRS = examples")
>> +                                "SUBDIRS =")))))
>> +                      #~())
>
> Did you report it upstream?  Perhaps they'd know how to properly fix it.

Digging all bugs, what about this?

It could be nice if it is fixed upstream.  On the other, we could also
apply a fix waiting such fix.

WDYT?

Cheers,
simon

bug#63077: [PATCH] gnu: gnutls: skip examples on mingw.

[Vivien Kraus via Bug reports for GNU Guix]

Hello,

Le vendredi 08 mars 2024 à 18:22 +0100, Simon Tournier a écrit :
> > > +               #$@(if (target-mingw?)
> > > +                      #~((add-after 'unpack 'skip-doc-examples
> > > +                           ;; The examples in doc do not link to
> > > correct
> > > +                           ;; gnulib modules.
> > > +                           (lambda _
> > > +                             (substitute* "doc/Makefile.in"
> > > +                               (("SUBDIRS = examples")
> > > +                                "SUBDIRS =")))))
> > > +                      #~())
> > 
> > Did you report it upstream?  Perhaps they'd know how to properly
> > fix it.
> 
> Digging all bugs, what about this?
> 
> It could be nice if it is fixed upstream.  On the other, we could
> also
> apply a fix waiting such fix.

I reported it, and I believe upstream fixed it:

https://gitlab.com/gnutls/gnutls/-/merge_requests/1761/diffs?commit_id=5db0db2e83da54d799f55984dc33039d6b22c933

However it’s difficult to check because libidn2 fails (maybe the more
recent 2.3.7 does not).  This libidn2 failure seems to have been
reported here:

https://gitlab.com/libidn/libidn2/-/issues/113

I notice that libidn2 uses its own libunistring instead of the guix’
one, because libunistring is not an input of libidn2.  Is this intended
to avoid a cycle?

Best regards,

Vivien