guix-commits
[Top][All Lists]
Advanced

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

branch core-updates updated: gnu: gnutls: Fix build.


From: guix-commits
Subject: branch core-updates updated: gnu: gnutls: Fix build.
Date: Wed, 23 Sep 2020 22:40:14 -0400

This is an automated email from the git hooks/post-receive script.

apteryx pushed a commit to branch core-updates
in repository guix.

The following commit(s) were added to refs/heads/core-updates by this push:
     new 5cf6f6f  gnu: gnutls: Fix build.
5cf6f6f is described below

commit 5cf6f6fe7b610e50d4f723f345799092d2b518ba
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Wed Sep 23 01:26:57 2020 -0400

    gnu: gnutls: Fix build.
    
    Fixes <http://issues.guix.gnu.org/43561>.
    
    * gnu/packages/tls.scm (gnutls)[phases]{disable-failing-tests}: Add phase.
    [native-inputs]: Add autoconf, automake, gettext-minimal, libtool and 
texinfo.
---
 gnu/packages/tls.scm | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index a773b07..c5f25aa 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -15,6 +15,7 @@
 ;;; Copyright © 2018 Clément Lassieur <clement@lassieur.org>
 ;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
 ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -45,11 +46,13 @@
   #:use-module (guix build-system trivial)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages)
+  #:use-module (gnu packages autotools)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages check)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages dns)
   #:use-module (gnu packages gawk)
+  #:use-module (gnu packages gettext)
   #:use-module (gnu packages guile)
   #:use-module (gnu packages hurd)
   #:use-module (gnu packages libbsd)
@@ -211,8 +214,16 @@ living in the same process.")
              "--without-p11-kit")
 
        #:phases (modify-phases %standard-phases
-                  (add-after
-                   'install 'move-doc
+                  ;; fastopen.sh fails to connect to the server in the builder
+                  ;; environment (see:
+                  ;; https://gitlab.com/gnutls/gnutls/-/issues/1095).
+                  (add-after 'unpack 'disable-failing-tests
+                    (lambda _
+                      (delete-file "configure")
+                      (substitute* "tests/Makefile.am"
+                        (("fastopen.sh") ""))
+                      #t))
+                  (add-after 'install 'move-doc
                    (lambda* (#:key outputs #:allow-other-keys)
                      ;; Copy the 4.1 MiB of section 3 man pages to "doc".
                      (let* ((out    (assoc-ref outputs "out"))
@@ -229,7 +240,12 @@ living in the same process.")
     (native-inputs
      `(,@(if (hurd-target?) '()
              `(("net-tools" ,net-tools)))
+       ("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("gettext" ,gettext-minimal)
+       ("libtool" ,libtool)
        ("pkg-config" ,pkg-config)
+       ("texinfo" ,texinfo)
        ("which" ,which)
        ,@(if (hurd-target?) '()
              `(("datefudge" ,datefudge)))         ;tests rely on 'datefudge'



reply via email to

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