summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitry Pankratov <dmitry@pankratov.net>2016-11-13 08:10:34 (GMT)
committerDmitry Pankratov <dmitry@pankratov.net>2016-11-13 08:10:34 (GMT)
commit2cc9e68596005f5e742b5aae0bb8b73cd15cf367 (patch)
treedb7b5888c7f3202a59d23389ed643205e94a63e4
parentfa9f2bda11c529dc4752d6792f6b3eb91b7ad3ae (diff)
parent2d2bf76e9132693e6c7d424f646dc4c92eb17434 (diff)
Merge remote-tracking branch 'upstream/master'
-rw-r--r--config/libc/glibc.in6
-rw-r--r--patches/glibc/2.24/100-Cygwin-doesnt-have-stat64.patch13
2 files changed, 19 insertions, 0 deletions
diff --git a/config/libc/glibc.in b/config/libc/glibc.in
index 96879cc..3ab88e9 100644
--- a/config/libc/glibc.in
+++ b/config/libc/glibc.in
@@ -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
diff --git a/patches/glibc/2.24/100-Cygwin-doesnt-have-stat64.patch b/patches/glibc/2.24/100-Cygwin-doesnt-have-stat64.patch
new file mode 100644
index 0000000..9097628
--- /dev/null
+++ b/patches/glibc/2.24/100-Cygwin-doesnt-have-stat64.patch
@@ -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
+