10/10: gnu: nvi: Fix build with glibc 2.30.

[guix-commits]

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

commit 3440fecd4eff3bde98a4ffe7ad241f2b23ba1f5f
Author: Marius Bakke <address@hidden>
AuthorDate: Thu Jan 23 23:28:57 2020 +0100

    gnu: nvi: Fix build with glibc 2.30.
    
    * gnu/packages/nvi.scm (nvi)[source](modules): New field.
    [source](snippet): Add substitution to prevent including code that relies on
    obsolete glibc functions.
---
 gnu/packages/nvi.scm | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/gnu/packages/nvi.scm b/gnu/packages/nvi.scm
index 187de31..c34b1ca 100644
--- a/gnu/packages/nvi.scm
+++ b/gnu/packages/nvi.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014 Marek Benc <address@hidden>
+;;; Copyright © 2020 Marius Bakke <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -40,6 +41,7 @@
         (patches (search-patches "nvi-assume-preserve-path.patch"
                                  "nvi-dbpagesize-binpower.patch"
                                  "nvi-db4.patch"))
+        (modules '((guix build utils)))
         (snippet
           ;; Create a wrapper for the configure script, make it executable.
           '(let ((conf-wrap (open-output-file "configure")))
@@ -51,6 +53,12 @@
              (newline conf-wrap)
              (close-output-port conf-wrap)
              (chmod "configure" #o0755)
+
+             ;; Glibc 2.30 removed the deprecated <sys/stropts.h>, so fall back
+             ;; to the internal PTY allocation logic.
+             (substitute* "ex/ex_script.c"
+               (("#ifdef HAVE_SYS5_PTY")
+                "#if defined(HAVE_SYS5_PTY) && !defined(__GLIBC__)"))
              #t))))
 
     (build-system gnu-build-system)