From b4437a8f70b7563eab6cf72e7a1c7ebc8090f3de Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Wed, 29 Sep 2010 16:57:35 +0200 Subject: update eglibc and ibm x40 target, fix macosx cross-compile --- toolchain/eglibc/Makefile.inc | 4 +- toolchain/eglibc/patches/eglibc-cross.patch | 93 ++++++++++++++++------------- 2 files changed, 55 insertions(+), 42 deletions(-) (limited to 'toolchain') diff --git a/toolchain/eglibc/Makefile.inc b/toolchain/eglibc/Makefile.inc index 0dba0457c..213ab1775 100644 --- a/toolchain/eglibc/Makefile.inc +++ b/toolchain/eglibc/Makefile.inc @@ -2,7 +2,7 @@ # material, please see the LICENCE file in the top-level directory. PKG_NAME:= eglibc -PKG_VERSION:= 2.11.1 +PKG_VERSION:= 2.12 PKG_RELEASE:= 1 -PKG_MD5SUM:= 393cfbba56898bf7d5d5444fe3313cb4 +PKG_MD5SUM:= 99f1682764c88220c255f6e07237410f PKG_SITES:= http://openadk.org/distfiles/ diff --git a/toolchain/eglibc/patches/eglibc-cross.patch b/toolchain/eglibc/patches/eglibc-cross.patch index 348232cf0..384a5c16b 100644 --- a/toolchain/eglibc/patches/eglibc-cross.patch +++ b/toolchain/eglibc/patches/eglibc-cross.patch @@ -1,11 +1,24 @@ -diff -Nur eglibc-2.11.1.orig/libc/sunrpc/rpc/types.h eglibc-2.11.1/libc/sunrpc/rpc/types.h ---- eglibc-2.11.1.orig/libc/sunrpc/rpc/types.h 2010-02-24 08:09:59.000000000 +0100 -+++ eglibc-2.11.1/libc/sunrpc/rpc/types.h 2010-03-22 18:30:14.944408497 +0100 +diff -Nur eglibc-2.12.orig/libc/sunrpc/proto.h eglibc-2.12/libc/sunrpc/proto.h +--- eglibc-2.12.orig/libc/sunrpc/proto.h 2010-09-28 19:14:26.000000000 +0200 ++++ eglibc-2.12/libc/sunrpc/proto.h 2010-09-29 14:05:15.000000000 +0200 +@@ -58,7 +58,9 @@ + + /* Rather then defining _GNU_SOURCE before including $build's + we just declare stpcpy here. */ ++#if !defined(__APPLE__) + extern char *stpcpy (char *, const char *); ++#endif + + /* Use $build's i18n support as we can't use $host's. */ + #define _(X) (gettext (X)) +diff -Nur eglibc-2.12.orig/libc/sunrpc/rpc/types.h eglibc-2.12/libc/sunrpc/rpc/types.h +--- eglibc-2.12.orig/libc/sunrpc/rpc/types.h 2010-09-28 19:14:26.000000000 +0200 ++++ eglibc-2.12/libc/sunrpc/rpc/types.h 2010-09-29 12:45:55.000000000 +0200 @@ -68,6 +68,7 @@ #include #endif -+#if !defined(_CROSS_RPCGEN_) ++#if !defined(_CROSS_RPCGEN_) || !defined(__APPLE__) #ifndef __u_char_defined typedef __u_char u_char; typedef __u_short u_short; @@ -17,9 +30,9 @@ diff -Nur eglibc-2.11.1.orig/libc/sunrpc/rpc/types.h eglibc-2.11.1/libc/sunrpc/r #include #include -diff -Nur eglibc-2.11.1.orig/libc/sunrpc/rpc_clntout.c eglibc-2.11.1/libc/sunrpc/rpc_clntout.c ---- eglibc-2.11.1.orig/libc/sunrpc/rpc_clntout.c 2010-02-24 08:10:01.000000000 +0100 -+++ eglibc-2.11.1/libc/sunrpc/rpc_clntout.c 2010-03-22 18:30:38.973160151 +0100 +diff -Nur eglibc-2.12.orig/libc/sunrpc/rpc_clntout.c eglibc-2.12/libc/sunrpc/rpc_clntout.c +--- eglibc-2.12.orig/libc/sunrpc/rpc_clntout.c 2010-09-28 19:14:27.000000000 +0200 ++++ eglibc-2.12/libc/sunrpc/rpc_clntout.c 2010-09-29 12:45:11.000000000 +0200 @@ -31,7 +31,7 @@ */ #include @@ -29,39 +42,9 @@ diff -Nur eglibc-2.11.1.orig/libc/sunrpc/rpc_clntout.c eglibc-2.11.1/libc/sunrpc #include "rpc_parse.h" #include "rpc_util.h" #include "proto.h" -diff -Nur eglibc-2.11.1.orig/libc/sunrpc/rpc_scan.c eglibc-2.11.1/libc/sunrpc/rpc_scan.c ---- eglibc-2.11.1.orig/libc/sunrpc/rpc_scan.c 2010-02-24 08:10:00.000000000 +0100 -+++ eglibc-2.11.1/libc/sunrpc/rpc_scan.c 2010-03-22 18:31:16.146907097 +0100 -@@ -36,7 +36,11 @@ - #include - #include - #include -+#ifdef _CROSS_RPCGEN_ -+#define gettext(X) (X) -+#else - #include -+#endif - #include "rpc_scan.h" - #include "rpc_parse.h" - #include "rpc_util.h" -diff -Nur eglibc-2.11.1.orig/libc/timezone/Makefile eglibc-2.11.1/libc/timezone/Makefile ---- eglibc-2.11.1.orig/libc/timezone/Makefile 2010-02-24 08:09:02.000000000 +0100 -+++ eglibc-2.11.1/libc/timezone/Makefile 2010-03-22 18:50:04.134408513 +0100 -@@ -181,8 +182,9 @@ - $(objpfx)zic: $(addprefix $(objpfx), $(zic-objs)) - - $(addprefix $(objpfx)cross-,$(zic-objs)): $(objpfx)cross-%.o: %.c -- gcc $< -c $(OUTPUT_OPTION) $(CFLAGS-$*.c) $(CPPFLAGS-$*) \ -- -DCROSS_ZIC $(compile-mkdep-flags) -+ gcc $< -c $(OUTPUT_OPTION) \ -+ $(filter-out -DHAVE_GETTEXT,$(CFLAGS-$*.c)) \ -+ $(CPPFLAGS-$*) -DCROSS_ZIC $(compile-mkdep-flags) - - $(objpfx)cross-zic: $(addprefix $(objpfx)cross-,$(zic-objs)) - gcc $(addprefix $(objpfx)cross-,$(zic-objs)) -o $@ -diff -Nur eglibc-2.11.1.orig/libc/sunrpc/rpc_main.c eglibc-2.11.1/libc/sunrpc/rpc_main.c ---- eglibc-2.11.1.orig/libc/sunrpc/rpc_main.c 2010-02-24 08:10:00.000000000 +0100 -+++ eglibc-2.11.1/libc/sunrpc/rpc_main.c 2010-06-20 13:32:42.000000000 +0200 +diff -Nur eglibc-2.12.orig/libc/sunrpc/rpc_main.c eglibc-2.12/libc/sunrpc/rpc_main.c +--- eglibc-2.12.orig/libc/sunrpc/rpc_main.c 2010-09-28 19:14:27.000000000 +0200 ++++ eglibc-2.12/libc/sunrpc/rpc_main.c 2010-09-29 12:45:11.000000000 +0200 @@ -37,7 +37,11 @@ #include #include @@ -90,3 +73,33 @@ diff -Nur eglibc-2.11.1.orig/libc/sunrpc/rpc_main.c eglibc-2.11.1/libc/sunrpc/rp } else +diff -Nur eglibc-2.12.orig/libc/sunrpc/rpc_scan.c eglibc-2.12/libc/sunrpc/rpc_scan.c +--- eglibc-2.12.orig/libc/sunrpc/rpc_scan.c 2010-09-28 19:14:27.000000000 +0200 ++++ eglibc-2.12/libc/sunrpc/rpc_scan.c 2010-09-29 12:45:11.000000000 +0200 +@@ -36,7 +36,11 @@ + #include + #include + #include ++#ifdef _CROSS_RPCGEN_ ++#define gettext(X) (X) ++#else + #include ++#endif + #include "rpc_scan.h" + #include "rpc_parse.h" + #include "rpc_util.h" +diff -Nur eglibc-2.12.orig/libc/timezone/Makefile eglibc-2.12/libc/timezone/Makefile +--- eglibc-2.12.orig/libc/timezone/Makefile 2010-09-28 19:13:39.000000000 +0200 ++++ eglibc-2.12/libc/timezone/Makefile 2010-09-29 12:45:11.000000000 +0200 +@@ -181,8 +181,9 @@ + $(objpfx)zic: $(addprefix $(objpfx), $(zic-objs)) + + $(addprefix $(objpfx)cross-,$(zic-objs)): $(objpfx)cross-%.o: %.c +- gcc $< -c $(OUTPUT_OPTION) $(CFLAGS-$*.c) $(CPPFLAGS-$*) \ +- -DCROSS_ZIC $(compile-mkdep-flags) ++ gcc $< -c $(OUTPUT_OPTION) \ ++ $(filter-out -DHAVE_GETTEXT,$(CFLAGS-$*.c)) \ ++ $(CPPFLAGS-$*) -DCROSS_ZIC $(compile-mkdep-flags) + + $(objpfx)cross-zic: $(addprefix $(objpfx)cross-,$(zic-objs)) + gcc $(addprefix $(objpfx)cross-,$(zic-objs)) -o $@ -- cgit v1.2.3