From 5565eda44fc660ce92c85460ec55370921df5903 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 7 Feb 2017 04:10:31 +0100 Subject: glibc: update to 2.25 --- toolchain/glibc/Makefile.inc | 8 ++--- toolchain/glibc/patches/2.22/glibc-cross.patch | 41 ---------------------- toolchain/glibc/patches/2.22/sparc-include.patch | 11 ------ .../patches/2.22/sysdep-include-microblaze.patch | 22 ------------ toolchain/glibc/patches/2.23/glibc-cross.patch | 41 ---------------------- toolchain/glibc/patches/2.24/glibc-cross.patch | 41 ---------------------- toolchain/glibc/patches/2.25/glibc-cross.patch | 41 ++++++++++++++++++++++ 7 files changed, 45 insertions(+), 160 deletions(-) delete mode 100644 toolchain/glibc/patches/2.22/glibc-cross.patch delete mode 100644 toolchain/glibc/patches/2.22/sparc-include.patch delete mode 100644 toolchain/glibc/patches/2.22/sysdep-include-microblaze.patch delete mode 100644 toolchain/glibc/patches/2.23/glibc-cross.patch delete mode 100644 toolchain/glibc/patches/2.24/glibc-cross.patch create mode 100644 toolchain/glibc/patches/2.25/glibc-cross.patch (limited to 'toolchain') diff --git a/toolchain/glibc/Makefile.inc b/toolchain/glibc/Makefile.inc index f145fb02e..f87feb2f8 100644 --- a/toolchain/glibc/Makefile.inc +++ b/toolchain/glibc/Makefile.inc @@ -3,14 +3,14 @@ PKG_NAME:= glibc ifeq ($(ADK_LIBC_VERSION),git) -PKG_VERSION:= 2.24.90 +PKG_VERSION:= 2.25.90 PKG_SITES:= git://sourceware.org/git/glibc.git PKG_RELEASE:= 1 endif -ifeq ($(ADK_TARGET_LIB_GLIBC_2_24),y) -PKG_VERSION:= 2.24 +ifeq ($(ADK_TARGET_LIB_GLIBC_2_25),y) +PKG_VERSION:= 2.25 PKG_SITES:= ${MASTER_SITE_GNU:=glibc/} PKG_RELEASE:= 1 -PKG_HASH:= 99d4a3e8efd144d71488e478f62587578c0f4e1fa0b4eed47ee3d4975ebeb5d3 +PKG_HASH:= 067bd9bb3390e79aa45911537d13c3721f1d9d3769931a30c2681bfee66f23a0 endif DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.xz diff --git a/toolchain/glibc/patches/2.22/glibc-cross.patch b/toolchain/glibc/patches/2.22/glibc-cross.patch deleted file mode 100644 index c38ea8a3c..000000000 --- a/toolchain/glibc/patches/2.22/glibc-cross.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -Nur glibc-2.22.orig/sunrpc/rpc_main.c glibc-2.22/sunrpc/rpc_main.c ---- glibc-2.22.orig/sunrpc/rpc_main.c 2015-08-05 08:42:21.000000000 +0200 -+++ glibc-2.22/sunrpc/rpc_main.c 2015-12-08 06:21:38.000000000 +0100 -@@ -38,7 +38,11 @@ - #include - #include - #include -+#if defined(__APPLE__) || defined(__CYGWIN__) -+#define gettext(X) (X) -+#else - #include -+#endif - #include - #include - #include -@@ -51,6 +55,10 @@ - #include "rpc_scan.h" - #include "proto.h" - -+#ifdef __CYGWIN__ -+#define stat64 stat -+#endif -+ - #include "../version.h" - #define PACKAGE _libc_intl_domainname - -diff -Nur glibc-2.22.orig/sunrpc/rpc_scan.c glibc-2.22/sunrpc/rpc_scan.c ---- glibc-2.22.orig/sunrpc/rpc_scan.c 2015-08-05 08:42:21.000000000 +0200 -+++ glibc-2.22/sunrpc/rpc_scan.c 2015-12-08 06:22:36.000000000 +0100 -@@ -37,7 +37,11 @@ - #include - #include - #include -+#if defined(__APPLE__) || defined(__CYGWIN__) -+#define gettext(X) (X) -+#else - #include -+#endif - #include "rpc_scan.h" - #include "rpc_parse.h" - #include "rpc_util.h" diff --git a/toolchain/glibc/patches/2.22/sparc-include.patch b/toolchain/glibc/patches/2.22/sparc-include.patch deleted file mode 100644 index 569a68b0c..000000000 --- a/toolchain/glibc/patches/2.22/sparc-include.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur glibc-2.22.orig/sysdeps/sparc/sparc32/sem_open.c glibc-2.22/sysdeps/sparc/sparc32/sem_open.c ---- glibc-2.22.orig/sysdeps/sparc/sparc32/sem_open.c 2015-08-05 08:42:21.000000000 +0200 -+++ glibc-2.22/sysdeps/sparc/sparc32/sem_open.c 2015-09-04 09:42:55.092504540 +0200 -@@ -29,6 +29,7 @@ - #include - #include - #include "semaphoreP.h" -+#include - #include - - diff --git a/toolchain/glibc/patches/2.22/sysdep-include-microblaze.patch b/toolchain/glibc/patches/2.22/sysdep-include-microblaze.patch deleted file mode 100644 index 8d02493af..000000000 --- a/toolchain/glibc/patches/2.22/sysdep-include-microblaze.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -Nur glibc-2.22.orig/sysdeps/unix/sysv/linux/microblaze/sysdep.h glibc-2.22/sysdeps/unix/sysv/linux/microblaze/sysdep.h ---- glibc-2.22.orig/sysdeps/unix/sysv/linux/microblaze/sysdep.h 2015-08-05 08:42:21.000000000 +0200 -+++ glibc-2.22/sysdeps/unix/sysv/linux/microblaze/sysdep.h 2015-08-08 10:00:04.148568537 +0200 -@@ -16,8 +16,11 @@ - License along with the GNU C Library; if not, see - . */ - -+#ifndef _LINUX_MICROBLAZE_SYSDEP_H -+#define _LINUX_MICROBLAZE_SYSDEP_H 1 -+ -+#include - #include --#include - - /* Defines RTLD_PRIVATE_ERRNO. */ - #include -@@ -305,3 +308,5 @@ - # define PTR_DEMANGLE(var) (void) (var) - - #endif /* not __ASSEMBLER__ */ -+ -+#endif /* _LINUX_MICROBLAZE_SYSDEP_H */ diff --git a/toolchain/glibc/patches/2.23/glibc-cross.patch b/toolchain/glibc/patches/2.23/glibc-cross.patch deleted file mode 100644 index c38ea8a3c..000000000 --- a/toolchain/glibc/patches/2.23/glibc-cross.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -Nur glibc-2.22.orig/sunrpc/rpc_main.c glibc-2.22/sunrpc/rpc_main.c ---- glibc-2.22.orig/sunrpc/rpc_main.c 2015-08-05 08:42:21.000000000 +0200 -+++ glibc-2.22/sunrpc/rpc_main.c 2015-12-08 06:21:38.000000000 +0100 -@@ -38,7 +38,11 @@ - #include - #include - #include -+#if defined(__APPLE__) || defined(__CYGWIN__) -+#define gettext(X) (X) -+#else - #include -+#endif - #include - #include - #include -@@ -51,6 +55,10 @@ - #include "rpc_scan.h" - #include "proto.h" - -+#ifdef __CYGWIN__ -+#define stat64 stat -+#endif -+ - #include "../version.h" - #define PACKAGE _libc_intl_domainname - -diff -Nur glibc-2.22.orig/sunrpc/rpc_scan.c glibc-2.22/sunrpc/rpc_scan.c ---- glibc-2.22.orig/sunrpc/rpc_scan.c 2015-08-05 08:42:21.000000000 +0200 -+++ glibc-2.22/sunrpc/rpc_scan.c 2015-12-08 06:22:36.000000000 +0100 -@@ -37,7 +37,11 @@ - #include - #include - #include -+#if defined(__APPLE__) || defined(__CYGWIN__) -+#define gettext(X) (X) -+#else - #include -+#endif - #include "rpc_scan.h" - #include "rpc_parse.h" - #include "rpc_util.h" diff --git a/toolchain/glibc/patches/2.24/glibc-cross.patch b/toolchain/glibc/patches/2.24/glibc-cross.patch deleted file mode 100644 index c38ea8a3c..000000000 --- a/toolchain/glibc/patches/2.24/glibc-cross.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -Nur glibc-2.22.orig/sunrpc/rpc_main.c glibc-2.22/sunrpc/rpc_main.c ---- glibc-2.22.orig/sunrpc/rpc_main.c 2015-08-05 08:42:21.000000000 +0200 -+++ glibc-2.22/sunrpc/rpc_main.c 2015-12-08 06:21:38.000000000 +0100 -@@ -38,7 +38,11 @@ - #include - #include - #include -+#if defined(__APPLE__) || defined(__CYGWIN__) -+#define gettext(X) (X) -+#else - #include -+#endif - #include - #include - #include -@@ -51,6 +55,10 @@ - #include "rpc_scan.h" - #include "proto.h" - -+#ifdef __CYGWIN__ -+#define stat64 stat -+#endif -+ - #include "../version.h" - #define PACKAGE _libc_intl_domainname - -diff -Nur glibc-2.22.orig/sunrpc/rpc_scan.c glibc-2.22/sunrpc/rpc_scan.c ---- glibc-2.22.orig/sunrpc/rpc_scan.c 2015-08-05 08:42:21.000000000 +0200 -+++ glibc-2.22/sunrpc/rpc_scan.c 2015-12-08 06:22:36.000000000 +0100 -@@ -37,7 +37,11 @@ - #include - #include - #include -+#if defined(__APPLE__) || defined(__CYGWIN__) -+#define gettext(X) (X) -+#else - #include -+#endif - #include "rpc_scan.h" - #include "rpc_parse.h" - #include "rpc_util.h" diff --git a/toolchain/glibc/patches/2.25/glibc-cross.patch b/toolchain/glibc/patches/2.25/glibc-cross.patch new file mode 100644 index 000000000..c38ea8a3c --- /dev/null +++ b/toolchain/glibc/patches/2.25/glibc-cross.patch @@ -0,0 +1,41 @@ +diff -Nur glibc-2.22.orig/sunrpc/rpc_main.c glibc-2.22/sunrpc/rpc_main.c +--- glibc-2.22.orig/sunrpc/rpc_main.c 2015-08-05 08:42:21.000000000 +0200 ++++ glibc-2.22/sunrpc/rpc_main.c 2015-12-08 06:21:38.000000000 +0100 +@@ -38,7 +38,11 @@ + #include + #include + #include ++#if defined(__APPLE__) || defined(__CYGWIN__) ++#define gettext(X) (X) ++#else + #include ++#endif + #include + #include + #include +@@ -51,6 +55,10 @@ + #include "rpc_scan.h" + #include "proto.h" + ++#ifdef __CYGWIN__ ++#define stat64 stat ++#endif ++ + #include "../version.h" + #define PACKAGE _libc_intl_domainname + +diff -Nur glibc-2.22.orig/sunrpc/rpc_scan.c glibc-2.22/sunrpc/rpc_scan.c +--- glibc-2.22.orig/sunrpc/rpc_scan.c 2015-08-05 08:42:21.000000000 +0200 ++++ glibc-2.22/sunrpc/rpc_scan.c 2015-12-08 06:22:36.000000000 +0100 +@@ -37,7 +37,11 @@ + #include + #include + #include ++#if defined(__APPLE__) || defined(__CYGWIN__) ++#define gettext(X) (X) ++#else + #include ++#endif + #include "rpc_scan.h" + #include "rpc_parse.h" + #include "rpc_util.h" -- cgit v1.2.3