me
/
guix
Archived
1
0
Fork 0
Code

gnu: gnutls: Remove dependency on the Autotools. 

This is a followup to 5cf6f6fe7b.

* gnu/packages/tls.scm (gnutls)[arguments]: In 'disable-failing-tests'
phase, change 'tests/fastopen.sh' instead of 'tests/Makefile.am'.
[native-inputs]: Remove AUTOCONF, AUTOMAKE, GETTEXT-MINIMAL, and
LIBTOOL.
master
Ludovic Courtès 2020-09-25 15:15:59 +02:00
parent e7ab9c33cc
commit 0b40d1a3b4
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gnu/packages/tls.scm
View File

@ -46,13 +46,11 @@
#:use-module (guix build-system trivial) #:use-module (guix build-system trivial)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages autotools)
#:use-module (gnu packages bash) #:use-module (gnu packages bash)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages curl) #:use-module (gnu packages curl)
#:use-module (gnu packages dns) #:use-module (gnu packages dns)
#:use-module (gnu packages gawk) #:use-module (gnu packages gawk)
#:use-module (gnu packages gettext)
#:use-module (gnu packages guile) #:use-module (gnu packages guile)
#:use-module (gnu packages hurd) #:use-module (gnu packages hurd)
#:use-module (gnu packages libbsd) #:use-module (gnu packages libbsd)
@ -221,9 +219,9 @@ living in the same process.")
;; https://gitlab.com/gnutls/gnutls/-/issues/1095). ;; https://gitlab.com/gnutls/gnutls/-/issues/1095).
(add-after 'unpack 'disable-failing-tests (add-after 'unpack 'disable-failing-tests
(lambda _ (lambda _
(delete-file "configure") (substitute* "tests/fastopen.sh"
(substitute* "tests/Makefile.am" (("^unset RETCODE")
(("fastopen.sh") "")) "exit 77\n")) ;skip
#t)) #t))
(add-after 'install 'move-doc (add-after 'install 'move-doc
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
@ -245,11 +243,6 @@ living in the same process.")
`(("net-tools" ,net-tools) `(("net-tools" ,net-tools)
("iproute" ,iproute) ;for 'ss' ("iproute" ,iproute) ;for 'ss'
("socat" ,socat))) ;several tests rely on it ("socat" ,socat))) ;several tests rely on it
("autoconf" ,autoconf)
("automake" ,automake)
("gettext" ,gettext-minimal)
("libtool" ,libtool)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)
("texinfo" ,texinfo) ("texinfo" ,texinfo)
("which" ,which) ("which" ,which)