From 2e92ddd2659ef6c55433db6f963e1fa1c54a3f88 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Fri, 13 Sep 2013 09:19:39 +0200
Subject: update glibc

---
 toolchain/glibc/Makefile.inc              |  4 ++--
 toolchain/glibc/patches/glibc-cross.patch | 22 +++++++++++-----------
 2 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'toolchain')

diff --git a/toolchain/glibc/Makefile.inc b/toolchain/glibc/Makefile.inc
index 2232e9bb2..7acb49bb3 100644
--- a/toolchain/glibc/Makefile.inc
+++ b/toolchain/glibc/Makefile.inc
@@ -2,9 +2,9 @@
 # material, please see the LICENCE file in the top-level directory.
 
 PKG_NAME:=		glibc
-PKG_VERSION:=		2.17
+PKG_VERSION:=		2.18
 PKG_RELEASE:=		1
-PKG_MD5SUM:=		8a7f11b9ac5d0d5efa4c82175b5a9c1b
+PKG_MD5SUM:=		b67b22b428ed183148d1344da6d22ea9
 PKG_SITES:=		${MASTER_SITE_GNU:=glibc/}
 GLIBC_CONFOPTS:=	--build=$(GNU_HOST_NAME) \
 			--host=$(REAL_GNU_TARGET_NAME) \
diff --git a/toolchain/glibc/patches/glibc-cross.patch b/toolchain/glibc/patches/glibc-cross.patch
index dadd8641b..4084fd20d 100644
--- a/toolchain/glibc/patches/glibc-cross.patch
+++ b/toolchain/glibc/patches/glibc-cross.patch
@@ -1,6 +1,6 @@
-diff -Nur glibc-2.17.orig/sunrpc/rpc/types.h glibc-2.17/sunrpc/rpc/types.h
---- glibc-2.17.orig/sunrpc/rpc/types.h	2012-12-25 04:02:13.000000000 +0100
-+++ glibc-2.17/sunrpc/rpc/types.h	2013-08-12 14:59:35.000000000 +0200
+diff -Nur glibc-2.18.orig/sunrpc/rpc/types.h glibc-2.18/sunrpc/rpc/types.h
+--- glibc-2.18.orig/sunrpc/rpc/types.h	2013-08-11 00:52:55.000000000 +0200
++++ glibc-2.18/sunrpc/rpc/types.h	2013-09-13 08:25:18.000000000 +0200
 @@ -69,19 +69,25 @@
  #include <sys/types.h>
  #endif
@@ -39,9 +39,9 @@ diff -Nur glibc-2.17.orig/sunrpc/rpc/types.h glibc-2.17/sunrpc/rpc/types.h
  # define __daddr_t_defined
  #endif
  
-diff -Nur glibc-2.17.orig/sunrpc/rpc_main.c glibc-2.17/sunrpc/rpc_main.c
---- glibc-2.17.orig/sunrpc/rpc_main.c	2012-12-25 04:02:13.000000000 +0100
-+++ glibc-2.17/sunrpc/rpc_main.c	2013-08-12 14:59:37.000000000 +0200
+diff -Nur glibc-2.18.orig/sunrpc/rpc_main.c glibc-2.18/sunrpc/rpc_main.c
+--- glibc-2.18.orig/sunrpc/rpc_main.c	2013-08-11 00:52:55.000000000 +0200
++++ glibc-2.18/sunrpc/rpc_main.c	2013-09-13 08:26:07.000000000 +0200
 @@ -38,7 +38,11 @@
  #include <stdio.h>
  #include <string.h>
@@ -51,10 +51,10 @@ diff -Nur glibc-2.17.orig/sunrpc/rpc_main.c glibc-2.17/sunrpc/rpc_main.c
 +#else
  #include <libintl.h>
 +#endif
+ #include <locale.h>
  #include <ctype.h>
  #include <sys/types.h>
- #include <sys/param.h>
-@@ -954,10 +958,12 @@
+@@ -958,10 +962,12 @@
  	abort ();
        temp = rindex (cmd->infile, '.');
        cp = stpcpy (mkfilename, "Makefile.");
@@ -70,9 +70,9 @@ diff -Nur glibc-2.17.orig/sunrpc/rpc_main.c glibc-2.17/sunrpc/rpc_main.c
  
      }
    else
-diff -Nur glibc-2.17.orig/sunrpc/rpc_scan.c glibc-2.17/sunrpc/rpc_scan.c
---- glibc-2.17.orig/sunrpc/rpc_scan.c	2012-12-25 04:02:13.000000000 +0100
-+++ glibc-2.17/sunrpc/rpc_scan.c	2013-08-12 14:59:37.000000000 +0200
+diff -Nur glibc-2.18.orig/sunrpc/rpc_scan.c glibc-2.18/sunrpc/rpc_scan.c
+--- glibc-2.18.orig/sunrpc/rpc_scan.c	2013-08-11 00:52:55.000000000 +0200
++++ glibc-2.18/sunrpc/rpc_scan.c	2013-09-13 08:25:18.000000000 +0200
 @@ -37,7 +37,11 @@
  #include <stdio.h>
  #include <ctype.h>
-- 
cgit v1.2.3