diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2013-08-14 12:51:52 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-08-14 12:51:52 +0200 |
commit | a7ced5ec9a36f2142d404053dc384ae3af1fe047 (patch) | |
tree | 0fbc32d5e91d00450a65d146c328966877b56e65 /toolchain/glibc/patches/glibc-cross.patch | |
parent | e2692cea04fe08014537bbecf5fb52033cb463e2 (diff) | |
parent | 47ba3ba77f0a108450c5536daf77271125953966 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'toolchain/glibc/patches/glibc-cross.patch')
-rw-r--r-- | toolchain/glibc/patches/glibc-cross.patch | 32 |
1 files changed, 10 insertions, 22 deletions
diff --git a/toolchain/glibc/patches/glibc-cross.patch b/toolchain/glibc/patches/glibc-cross.patch index f8e0c2416..dadd8641b 100644 --- a/toolchain/glibc/patches/glibc-cross.patch +++ b/toolchain/glibc/patches/glibc-cross.patch @@ -1,6 +1,6 @@ -diff -Nur glibc-2.16.0.orig/sunrpc/rpc/types.h glibc-2.16.0/sunrpc/rpc/types.h ---- glibc-2.16.0.orig/sunrpc/rpc/types.h 2012-06-30 21:12:34.000000000 +0200 -+++ glibc-2.16.0/sunrpc/rpc/types.h 2012-08-01 18:05:49.000000000 +0200 +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 @@ -69,19 +69,25 @@ #include <sys/types.h> #endif @@ -39,21 +39,9 @@ diff -Nur glibc-2.16.0.orig/sunrpc/rpc/types.h glibc-2.16.0/sunrpc/rpc/types.h # define __daddr_t_defined #endif -diff -Nur glibc-2.16.0.orig/sunrpc/rpc_clntout.c glibc-2.16.0/sunrpc/rpc_clntout.c ---- glibc-2.16.0.orig/sunrpc/rpc_clntout.c 2012-06-30 21:12:34.000000000 +0200 -+++ glibc-2.16.0/sunrpc/rpc_clntout.c 2012-08-01 18:05:49.000000000 +0200 -@@ -31,7 +31,7 @@ - */ - #include <stdio.h> - #include <string.h> --#include <rpc/types.h> -+#include "rpc/types.h" - #include "rpc_parse.h" - #include "rpc_util.h" - #include "proto.h" -diff -Nur glibc-2.16.0.orig/sunrpc/rpc_main.c glibc-2.16.0/sunrpc/rpc_main.c ---- glibc-2.16.0.orig/sunrpc/rpc_main.c 2012-06-30 21:12:34.000000000 +0200 -+++ glibc-2.16.0/sunrpc/rpc_main.c 2012-08-01 18:05:49.000000000 +0200 +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 @@ -38,7 +38,11 @@ #include <stdio.h> #include <string.h> @@ -66,7 +54,7 @@ diff -Nur glibc-2.16.0.orig/sunrpc/rpc_main.c glibc-2.16.0/sunrpc/rpc_main.c #include <ctype.h> #include <sys/types.h> #include <sys/param.h> -@@ -958,10 +962,12 @@ +@@ -954,10 +958,12 @@ abort (); temp = rindex (cmd->infile, '.'); cp = stpcpy (mkfilename, "Makefile."); @@ -82,9 +70,9 @@ diff -Nur glibc-2.16.0.orig/sunrpc/rpc_main.c glibc-2.16.0/sunrpc/rpc_main.c } else -diff -Nur glibc-2.16.0.orig/sunrpc/rpc_scan.c glibc-2.16.0/sunrpc/rpc_scan.c ---- glibc-2.16.0.orig/sunrpc/rpc_scan.c 2012-06-30 21:12:34.000000000 +0200 -+++ glibc-2.16.0/sunrpc/rpc_scan.c 2012-08-01 18:05:49.000000000 +0200 +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 @@ -37,7 +37,11 @@ #include <stdio.h> #include <ctype.h> |