From f2dc3cacf74468c5b9f94ee6d4f6efd813b93152 Mon Sep 17 00:00:00 2001 From: Ulrich Müller Date: Thu, 29 Aug 2019 15:16:01 +0200 Subject: Fix compilation with glibc-2.28, bug 681904. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ulrich Müller --- emacs/18.59/16_all_glibc-2.28.patch | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 emacs/18.59/16_all_glibc-2.28.patch diff --git a/emacs/18.59/16_all_glibc-2.28.patch b/emacs/18.59/16_all_glibc-2.28.patch new file mode 100644 index 0000000..295188d --- /dev/null +++ b/emacs/18.59/16_all_glibc-2.28.patch @@ -0,0 +1,27 @@ +Fix compilation with glibc-2.28. +https://bugs.gentoo.org/681904 + +--- emacs-18.59-orig/src/ChangeLog ++++ emacs-18.59/src/ChangeLog +@@ -1,3 +1,9 @@ ++2019-08-29 Ulrich Mueller ++ ++ * s-linux.h (PENDING_OUTPUT_COUNT): Fix conditional for new ++ C libio names. This was wrong since a long time, but finally broke ++ when glibc-2.28 dropped libio.h. ++ + 2018-07-01 Ulrich Müller + + * x11term.c (x_init_1): Save the O_NONBLOCK bit, so that it won't +--- emacs-18.59-orig/src/s-linux.h ++++ emacs-18.59/src/s-linux.h +@@ -230,7 +230,8 @@ + /* we have non-standard standard I/O (iostream) ... */ + #ifdef emacs + #include /* Get the definition of _IO_STDIO_H. */ +-#if defined(_IO_STDIO_H) || defined(_STDIO_USES_IOSTREAM) ++#if defined(_IO_STDIO_H) || defined(_STDIO_USES_IOSTREAM) \ ++ || defined _IO_EOF_SEEN || __GNU_LIBRARY__ == 1 + /* new C libio names */ + #define PENDING_OUTPUT_COUNT(FILE) \ + ((FILE)->_IO_write_ptr - (FILE)->_IO_write_base) -- cgit v1.2.3-65-gdbad