summary refs log tree commit diff
diff options
context:
space:
mode:
authorEfraim Flashner <efraim@flashner.co.il>2018-11-10 20:18:08 +0200
committerEfraim Flashner <efraim@flashner.co.il>2018-11-10 20:18:37 +0200
commit1de2937283b3f19abf50af77f955a5dc4313755a (patch)
tree51fad62ba3afab90574811401602f711d469662c
parent211db9caf7ffdaa9f2abc7d6216f239f96312545 (diff)
downloadguix-1de2937283b3f19abf50af77f955a5dc4313755a.tar.gz
gnu: idutils: Fix building with glibc@2.28.
* gnu/packages/idutils.scm (idutils)[source]: Add snippet to patch
bundled gnulib for glibc@2.28.
-rw-r--r--gnu/packages/idutils.scm16
1 files changed, 15 insertions, 1 deletions
diff --git a/gnu/packages/idutils.scm b/gnu/packages/idutils.scm
index abab0c16bf..81715591b4 100644
--- a/gnu/packages/idutils.scm
+++ b/gnu/packages/idutils.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2012, 2013, 2015 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 208 Efraim Flashner <efraim@flashner.co.il>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -35,7 +36,20 @@
              (sha256
               (base32
                "1hmai3422iaqnp34kkzxdnywl7n7pvlxp11vrw66ybxn9wxg90c1"))
-             (patches (search-patches "diffutils-gets-undeclared.patch"))))
+             (patches (search-patches "diffutils-gets-undeclared.patch"))
+             (modules '((guix build utils)))
+             (snippet
+              '(begin
+                 (substitute* (find-files "lib" "\\.c$")
+                   (("#if defined _IO_ftrylockfile")
+                    "#if defined _IO_EOF_SEEN"))
+                 (substitute* "lib/stdio-impl.h"
+                   (("^/\\* BSD stdio derived implementations")
+                    (string-append "#if !defined _IO_IN_BACKUP && defined _IO_EOF_SEEN\n"
+                                   "# define _IO_IN_BACKUP 0x100\n"
+                                   "#endif\n\n"
+                                   "/* BSD stdio derived implementations")))
+                 #t))))
     (build-system gnu-build-system)
     (native-inputs `(("emacs" ,emacs-minimal)))
     (home-page "https://www.gnu.org/software/idutils/")