civodul pushed a commit to branch core-updates
in repository guix.
commit f1a9c6e581e3b90713d11801dbab9a611f6fe63a
Author: Ludovic Courtès <[email protected]>
Date: Mon Oct 15 10:31:24 2018 +0200
gnu: lsof: Fix builds on glibc 2.28.
* gnu/packages/lsof.scm (lsof)[arguments]: In 'disable-failing-tests',
add 'substitute*' use for "tests/LTlib.c".
---
gnu/packages/lsof.scm | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/gnu/packages/lsof.scm b/gnu/packages/lsof.scm
index 8b3ebe2..311e244 100644
--- a/gnu/packages/lsof.scm
+++ b/gnu/packages/lsof.scm
@@ -2,6 +2,7 @@
;;; Copyright © 2013 Andreas Enge <[email protected]>
;;; Copyright © 2017 Efraim Flashner <[email protected]>
;;; Copyright © 2018 Tobias Geerinckx-Rice <[email protected]>
+;;; Copyright © 2018 Ludovic Courtès <[email protected]>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -77,6 +78,12 @@
#t))
(add-before 'check 'disable-failing-tests
(lambda _
+ ;; In libc 2.28, the 'major' and 'minor' macros are provided by
+ ;; <sys/sysmacros.h> only so include it.
+ (substitute* "tests/LTlib.c"
+ (("#ifndef lint")
+ "#include <sys/sysmacros.h>\n\n#ifndef lint"))
+
(substitute* "tests/Makefile"
;; Fails with ‘ERROR!!! client gethostbyaddr() failure’.
(("(STDTST=.*) LTsock" _ prefix) prefix)
