all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed

blob 21e9397fe9e34a95599632e3ae3d1da8155cea44 893 bytes (raw)
name: gnu/packages/patches/nvi-glibc-has-grantpt.patch 	 # note: path name is non-authoritative(*)

This patch originates from the Debian project, see https://www.debian.org/

20glibc_has_grantpt.dpatch by  <hesso@pool.math.tu-berlin.de>


glibc has grantpt(), so only check for HAVE_SYS5_PTY on non-glibc installations.

diff -Naur nvi-1.81.6.orig/ex/ex_script.c nvi-1.81.6/ex/ex_script.c
--- nvi-1.81.6.orig/ex/ex_script.c	2007-11-18 17:41:42.000000000 +0100
+++ nvi-1.81.6/ex/ex_script.c	2008-05-01 18:24:06.000000000 +0200
@@ -23,7 +23,8 @@
 #include <sys/select.h>
 #endif
 #include <sys/stat.h>
-#ifdef HAVE_SYS5_PTY
+/* glibc2.1 defines grantpt but there is no stropts.h */
+#if defined(HAVE_SYS5_PTY) && !defined(__GLIBC__)  
 #include <sys/stropts.h>
 #endif
 #include <sys/time.h>
@@ -664,7 +665,7 @@
 	F_CLR(gp, G_SCRWIN);
 }
 
-#ifdef HAVE_SYS5_PTY
+#if defined(HAVE_SYS5_PTY) && !defined(__GLIBC__)
 static int ptys_open __P((int, char *));
 static int ptym_open __P((char *));
 

debug log:

solving 21e9397 ...
found 21e9397 in https://yhetil.org/guix/54BE9C68.9070103@gmail.com/

applying [1/1] https://yhetil.org/guix/54BE9C68.9070103@gmail.com/
diff --git a/gnu/packages/patches/nvi-glibc-has-grantpt.patch b/gnu/packages/patches/nvi-glibc-has-grantpt.patch
new file mode 100644
index 0000000..21e9397

1:23: trailing whitespace.
+#if defined(HAVE_SYS5_PTY) && !defined(__GLIBC__)  
1:28: space before tab in indent.
 	F_CLR(gp, G_SCRWIN);
1:30: trailing whitespace.
 
1:35: trailing whitespace.
 
Checking patch gnu/packages/patches/nvi-glibc-has-grantpt.patch...
1:35: new blank line at EOF.
+
Applied patch gnu/packages/patches/nvi-glibc-has-grantpt.patch cleanly.
warning: 5 lines add whitespace errors.

index at:
100644 21e9397fe9e34a95599632e3ae3d1da8155cea44	gnu/packages/patches/nvi-glibc-has-grantpt.patch

(*) Git path names are given by the tree(s) the blob belongs to.
    Blobs themselves have no identifier aside from the hash of its contents.^

Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.