Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Dmitry Pankratov 2016-11-13 09:10:34 +01:00
commit 2cc9e68596
2 changed files with 19 additions and 0 deletions

View File

@ -71,6 +71,11 @@ choice
# Don't remove next line
# CT_INSERT_VERSION_BELOW
config LIBC_GLIBC_V_2_24
bool
prompt "2.24"
select LIBC_GLIBC_2_23_or_later
config LIBC_GLIBC_V_2_23
bool
prompt "2.23"
@ -125,6 +130,7 @@ config LIBC_VERSION
string
# Don't remove next line
# CT_INSERT_VERSION_STRING_BELOW
default "2.24" if LIBC_GLIBC_V_2_24
default "2.23" if LIBC_GLIBC_V_2_23
default "2.22" if LIBC_GLIBC_V_2_22
default "2.21" if LIBC_GLIBC_V_2_21

View File

@ -0,0 +1,13 @@
--- glibc-2.22/sunrpc/rpc_main.c.orig 2015-08-05 07:42:21.000000000 +0100
+++ glibc-2.22/sunrpc/rpc_main.c 2015-10-21 23:37:31.071268800 +0100
@@ -51,6 +51,10 @@
#include "rpc_scan.h"
#include "proto.h"
+#if defined(__CYGWIN__)
+#define stat64 stat
+#endif
+
#include "../version.h"
#define PACKAGE _libc_intl_domainname