guix-commits
[Top][All Lists]
Advanced

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

01/02: gnu: lsof: Fix builds on glibc 2.28.


From: Ludovic Courtès
Subject: 01/02: gnu: lsof: Fix builds on glibc 2.28.
Date: Mon, 15 Oct 2018 07:48:15 -0400 (EDT)

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

commit f1a9c6e581e3b90713d11801dbab9a611f6fe63a
Author: Ludovic Courtès <address@hidden>
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 <address@hidden>
 ;;; Copyright © 2017 Efraim Flashner <address@hidden>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
+;;; Copyright © 2018 Ludovic Courtès <address@hidden>
 ;;;
 ;;; 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)



reply via email to

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