diff options
| author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2014-12-26 15:46:10 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2014-12-26 15:46:10 +0100 |
| commit | 6a7c5ff345b197c1d5f0f845adb2bb0da9690075 (patch) | |
| tree | 133b7c7fde6834f5c66df5c279725e9dc9532deb /toolchain | |
| parent | 14cd662cfebfcc6a36f476a616ce902a4963d3b5 (diff) | |
| parent | 790bc1fc6d8870891f665714dbd7eb7ca11448e7 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'toolchain')
| -rw-r--r-- | toolchain/gcc/Makefile.inc | 2 | ||||
| -rw-r--r-- | toolchain/glibc/patches/2.20/glibc-cross.patch | 33 |
2 files changed, 23 insertions, 12 deletions
diff --git a/toolchain/gcc/Makefile.inc b/toolchain/gcc/Makefile.inc index 0acfdc50c..91bf4428c 100644 --- a/toolchain/gcc/Makefile.inc +++ b/toolchain/gcc/Makefile.inc @@ -12,7 +12,7 @@ LIBSTDCXXVER:= 19 endif ifeq ($(ADK_TOOLCHAIN_GCC_4_8_4),y) PKG_VERSION:= 4.8.4 -PKG_MD5SUM:= e2c60f5ef918be2db08df96c7d97d0c4 +PKG_MD5SUM:= 0c92ac45af5b280e301ca56b40fdaea2 PKG_SITES:= ${MASTER_SITE_GNU:=gcc/gcc-${PKG_VERSION}/} PKG_RELEASE:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/toolchain/glibc/patches/2.20/glibc-cross.patch b/toolchain/glibc/patches/2.20/glibc-cross.patch index a1903179d..5a655b7c5 100644 --- a/toolchain/glibc/patches/2.20/glibc-cross.patch +++ b/toolchain/glibc/patches/2.20/glibc-cross.patch @@ -1,6 +1,6 @@ -diff -Nur glibc-2.19.orig/sunrpc/rpc/types.h glibc-2.19/sunrpc/rpc/types.h ---- glibc-2.19.orig/sunrpc/rpc/types.h 2014-02-07 10:04:38.000000000 +0100 -+++ glibc-2.19/sunrpc/rpc/types.h 2014-03-03 13:42:42.000000000 +0100 +diff -Nur glibc-2.20.orig/sunrpc/rpc/types.h glibc-2.20/sunrpc/rpc/types.h +--- glibc-2.20.orig/sunrpc/rpc/types.h 2014-09-07 10:09:09.000000000 +0200 ++++ glibc-2.20/sunrpc/rpc/types.h 2014-12-26 10:30:51.733297900 +0100 @@ -74,19 +74,24 @@ # define __daddr_t_defined #endif @@ -38,14 +38,14 @@ diff -Nur glibc-2.19.orig/sunrpc/rpc/types.h glibc-2.19/sunrpc/rpc/types.h # define __daddr_t_defined #endif -diff -Nur glibc-2.19.orig/sunrpc/rpc_main.c glibc-2.19/sunrpc/rpc_main.c ---- glibc-2.19.orig/sunrpc/rpc_main.c 2014-02-07 10:04:38.000000000 +0100 -+++ glibc-2.19/sunrpc/rpc_main.c 2014-03-04 07:12:00.000000000 +0100 +diff -Nur glibc-2.20.orig/sunrpc/rpc_main.c glibc-2.20/sunrpc/rpc_main.c +--- glibc-2.20.orig/sunrpc/rpc_main.c 2014-09-07 10:09:09.000000000 +0200 ++++ glibc-2.20/sunrpc/rpc_main.c 2014-12-26 11:23:56.822092200 +0100 @@ -38,7 +38,11 @@ #include <stdio.h> #include <string.h> #include <unistd.h> -+#ifdef __APPLE__ ++#if defined(__APPLE__) || defined(__CYGWIN__) +#define gettext(X) (X) +#else #include <libintl.h> @@ -53,7 +53,18 @@ diff -Nur glibc-2.19.orig/sunrpc/rpc_main.c glibc-2.19/sunrpc/rpc_main.c #include <locale.h> #include <ctype.h> #include <sys/types.h> -@@ -958,10 +962,12 @@ +@@ -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 + +@@ -958,10 +966,12 @@ abort (); temp = rindex (cmd->infile, '.'); cp = stpcpy (mkfilename, "Makefile."); @@ -69,9 +80,9 @@ diff -Nur glibc-2.19.orig/sunrpc/rpc_main.c glibc-2.19/sunrpc/rpc_main.c } else -diff -Nur glibc-2.19.orig/sunrpc/rpc_scan.c glibc-2.19/sunrpc/rpc_scan.c ---- glibc-2.19.orig/sunrpc/rpc_scan.c 2014-02-07 10:04:38.000000000 +0100 -+++ glibc-2.19/sunrpc/rpc_scan.c 2014-03-04 07:11:29.000000000 +0100 +diff -Nur glibc-2.20.orig/sunrpc/rpc_scan.c glibc-2.20/sunrpc/rpc_scan.c +--- glibc-2.20.orig/sunrpc/rpc_scan.c 2014-09-07 10:09:09.000000000 +0200 ++++ glibc-2.20/sunrpc/rpc_scan.c 2014-12-26 10:30:51.764498000 +0100 @@ -37,7 +37,11 @@ #include <stdio.h> #include <ctype.h> |