summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Hundven <bryanhundven@gmail.com>2016-02-23 18:40:39 (GMT)
committerBryan Hundven <bryanhundven@gmail.com>2016-02-23 18:40:39 (GMT)
commit28aab280f477f8914e1776d57fe84e6ea1e2d98e (patch)
tree6d91a8c0673c1f59a2de78518aa821c394b32204
parent6df2abc6f1770c37993833f132f7e4d9931e5271 (diff)
parentcb601145999fd269f2acf751360cb6ee74d952b3 (diff)
Merge pull request #348 from bhundven/update_glibc
Update glibc
-rw-r--r--config/libc/glibc.in6
-rw-r--r--patches/glibc/2.23/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 97b0107..c1a4192 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_23
+ bool
+ prompt "2.23"
+ select LIBC_GLIBC_2_20_or_later
+
config LIBC_GLIBC_V_2_22
bool
prompt "2.22"
@@ -186,6 +191,7 @@ config LIBC_VERSION
string
# Don't remove next line
# CT_INSERT_VERSION_STRING_BELOW
+ 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
default "linaro-2.20-2014.11" if LIBC_GLIBC_LINARO_V_2_20
diff --git a/patches/glibc/2.23/100-Cygwin-doesnt-have-stat64.patch b/patches/glibc/2.23/100-Cygwin-doesnt-have-stat64.patch
new file mode 100644
index 0000000..9097628
--- /dev/null
+++ b/patches/glibc/2.23/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
+