[PATCH] gnu: gnutls: skip examples on mingw.

  • Open
  • quality assurance status badge
Details
2 participants
  • Maxim Cournoyer
  • Vivien Kraus
Owner
unassigned
Submitted by
Vivien Kraus
Severity
normal
V
V
Vivien Kraus wrote on 25 Apr 2023 23:26
(address . bug-guix@gnu.org)
c1af330c3f2958005595fa4de9f870c071373dc8.1682458873.git.vivien@planete-kraus.eu
* 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(+)

Toggle diff (24 lines)
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
M
M
Maxim Cournoyer wrote on 5 Jan 19:06 +0100
(name . Vivien Kraus)(address . vivien@planete-kraus.eu)(address . 63077@debbugs.gnu.org)
875y071wow.fsf@gmail.com
Hi Vivien,

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

Toggle quote (24 lines)
> * 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
?