From 3440fecd4eff3bde98a4ffe7ad241f2b23ba1f5f Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 23 Jan 2020 23:28:57 +0100 Subject: [PATCH] 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 187de31720..c34b1cad72 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 +;;; Copyright © 2020 Marius Bakke ;;; ;;; This file is part of GNU Guix. ;;; @@ -40,6 +41,7 @@ (define-public nvi (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 @@ (define-public nvi (newline conf-wrap) (close-output-port conf-wrap) (chmod "configure" #o0755) + + ;; Glibc 2.30 removed the deprecated , 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)