diff options
author | Alexey Neyman <stilor@att.net> | 2016-12-04 18:22:24 (GMT) |
---|---|---|
committer | Alexey Neyman <stilor@att.net> | 2016-12-06 18:33:20 (GMT) |
commit | f6ea9a68b26830f72f8f5242aba9b950f2e4da78 (patch) | |
tree | 84777ee4cb3d6c127a90f0ffcd3b6330060cfccc /patches/gettext/0.19.7 | |
parent | 31e2a8776da537a32790b318d3c944a80247f15d (diff) |
Add patches for <sys/select.h> issue on Cygwin.
From gnulib´s mailing list; paths modified to match gnulib module inside
gettext.
Signed-off-by: Alexey Neyman <stilor@att.net>
Diffstat (limited to 'patches/gettext/0.19.7')
-rw-r--r-- | patches/gettext/0.19.7/140-Fix-Cygwin-sys-select.patch | 44 | ||||
-rw-r--r-- | patches/gettext/0.19.7/150-Fix-Cygwin-sys-select-2.patch | 26 |
2 files changed, 70 insertions, 0 deletions
diff --git a/patches/gettext/0.19.7/140-Fix-Cygwin-sys-select.patch b/patches/gettext/0.19.7/140-Fix-Cygwin-sys-select.patch new file mode 100644 index 0000000..7f980ac --- /dev/null +++ b/patches/gettext/0.19.7/140-Fix-Cygwin-sys-select.patch @@ -0,0 +1,44 @@ +>From cfbc1c62a1ea5c5809d11b957ad29cd820db15b8 Mon Sep 17 00:00:00 2001 +From: Paul Eggert <address@hidden> +Date: Mon, 21 Mar 2016 00:49:17 -0700 +Subject: [PATCH] sys_select: port to new Cygwin + +Problem reported by Ken Brown in: +https://lists.gnu.org/archive/html/bug-gnulib/2016-03/msg00054.html +* lib/sys_select.in.h [__CYGWIN__]: Avoid "unknown type name" +diagnostics. +--- + ChangeLog | 8 ++++++++ + lib/sys_select.in.h | 10 ++++++---- + 2 files changed, 14 insertions(+), 4 deletions(-) + +diff --git a/gettext-tools/gnulib-lib/sys_select.in.h b/gettext-tools/gnulib-lib/sys_select.in.h +index d6d3f9f..7281144 100644 +--- a/gettext-tools/gnulib-lib/sys_select.in.h ++++ b/gettext-tools/gnulib-lib/sys_select.in.h +@@ -81,8 +81,9 @@ + of 'struct timeval', and no definition of this type. + Also, Mac OS X, AIX, HP-UX, IRIX, Solaris, Interix declare select() + in <sys/time.h>. +- But avoid namespace pollution on glibc systems. */ +-# ifndef __GLIBC__ ++ But avoid namespace pollution on glibc systems and "unknown type ++ name" problems on Cygwin. */ ++# if !(defined __GLIBC__ || defined __CYGWIN__) + # include <sys/time.h> + # endif + +@@ -100,10 +101,11 @@ + #endif + + /* Get definition of 'sigset_t'. +- But avoid namespace pollution on glibc systems. ++ But avoid namespace pollution on glibc systems and "unknown type ++ name" problems on Cygwin. + Do this after the include_next (for the sake of OpenBSD 5.0) but before + the split double-inclusion guard (for the sake of Solaris). */ +-#if !(defined __GLIBC__ && !defined __UCLIBC__) ++#if !((defined __GLIBC__ || defined __CYGWIN__) && !defined __UCLIBC__) + # include <signal.h> + #endif + diff --git a/patches/gettext/0.19.7/150-Fix-Cygwin-sys-select-2.patch b/patches/gettext/0.19.7/150-Fix-Cygwin-sys-select-2.patch new file mode 100644 index 0000000..caaf0a0 --- /dev/null +++ b/patches/gettext/0.19.7/150-Fix-Cygwin-sys-select-2.patch @@ -0,0 +1,26 @@ +--- a/gettext-tools/gnulib-lib/sys_select.in.h ++++ b/gettext-tools/gnulib-lib/sys_select.in.h +@@ -82,8 +82,8 @@ + Also, Mac OS X, AIX, HP-UX, IRIX, Solaris, Interix declare select() + in <sys/time.h>. + But avoid namespace pollution on glibc systems and "unknown type +- name" problems on Cygwin. */ +-# if !(defined __GLIBC__ || defined __CYGWIN__) ++ name" problems on newlib systems. */ ++# if !(defined __GLIBC__ || defined __NEWLIB__) + # include <sys/time.h> + # endif + +@@ -102,10 +102,10 @@ + + /* Get definition of 'sigset_t'. + But avoid namespace pollution on glibc systems and "unknown type +- name" problems on Cygwin. ++ name" problems on newlib systems.. + Do this after the include_next (for the sake of OpenBSD 5.0) but before + the split double-inclusion guard (for the sake of Solaris). */ +-#if !((defined __GLIBC__ || defined __CYGWIN__) && !defined __UCLIBC__) ++#if !((defined __GLIBC__ || defined __NEWLIB__) && !defined __UCLIBC__) + # include <signal.h> + #endif + |