[toolchain/eglibc] eglibc 2.14 needs our eglibc patchset as well
authorMirko Vogt <mirko@openwrt.org>
Sat, 21 Jan 2012 19:39:37 +0000 (19:39 +0000)
committerMirko Vogt <mirko@openwrt.org>
Sat, 21 Jan 2012 19:39:37 +0000 (19:39 +0000)
SVN-Revision: 29842

toolchain/eglibc/patches/2.14/100-fix_cross_rpcgen.patch [new file with mode: 0644]
toolchain/eglibc/patches/2.14/110-fix_cross_zic.patch [new file with mode: 0644]
toolchain/eglibc/patches/2.14/200-add-dl-search-paths.patch [new file with mode: 0644]

diff --git a/toolchain/eglibc/patches/2.14/100-fix_cross_rpcgen.patch b/toolchain/eglibc/patches/2.14/100-fix_cross_rpcgen.patch
new file mode 100644 (file)
index 0000000..8fe5cf3
--- /dev/null
@@ -0,0 +1,71 @@
+--- a/libc/sunrpc/proto.h
++++ b/libc/sunrpc/proto.h
+@@ -56,12 +56,14 @@ void add_type(int len, const char *type)
+    $build's C library and $host's GLIBC.  */
+ #ifdef _CROSS_RPCGEN_
++#undef stpcpy
++
+ /* Rather then defining _GNU_SOURCE before including $build's <string.h>
+    we just declare stpcpy here.  */
+ extern char *stpcpy (char *, const char *);
+-/* Use $build's i18n support as we can't use $host's.  */
+-#define _(X) (gettext (X))
++/* Do not use i18n support  */
++#define _(X) (X)
+ /* rpcgen sources check for __GNU_LIBRARY__ to tweak for GLIBC code
+    that rpcgen generates.  The proper fix would be to rename all those checks
+--- a/libc/sunrpc/rpc/types.h
++++ b/libc/sunrpc/rpc/types.h
+@@ -70,18 +70,23 @@ typedef unsigned long rpcport_t;
+ #endif
+ #ifndef __u_char_defined
+-typedef __u_char u_char;
+-typedef __u_short u_short;
+-typedef __u_int u_int;
+-typedef __u_long u_long;
+-typedef __quad_t quad_t;
+-typedef __u_quad_t u_quad_t;
+-typedef __fsid_t fsid_t;
++typedef unsigned char u_char;
++typedef unsigned short u_short;
++typedef unsigned int u_int;
++typedef unsigned long u_long;
++#if __WORDSIZE == 64
++typedef long int quad_t;
++typedef unsigned long int u_quad_t;
++#elif defined __GLIBC_HAVE_LONG_LONG
++typedef long long int quad_t;
++typedef unsigned long long int u_quad_t;
++#endif
++typedef u_quad_t fsid_t;
+ # define __u_char_defined
+ #endif
+-#ifndef __daddr_t_defined
+-typedef __daddr_t daddr_t;
+-typedef __caddr_t caddr_t;
++#if !defined(__daddr_t_defined) && defined(linux)
++typedef long int daddr_t;
++typedef char *caddr_t;
+ # define __daddr_t_defined
+ #endif
+--- a/libc/sunrpc/rpc_main.c
++++ b/libc/sunrpc/rpc_main.c
+@@ -997,9 +997,10 @@ mkfile_output (struct commandline *cmd)
+       abort ();
+       temp = rindex (cmd->infile, '.');
+       cp = stpcpy (mkfilename, "Makefile.");
+-      if (temp != NULL)
+-      *((char *) stpncpy (cp, cmd->infile, temp - cmd->infile)) = '\0';
+-      else
++      if (temp != NULL) {
++        strncpy(cp, cmd->infile, temp - cmd->infile);
++        cp[temp - cmd->infile - 1] = 0;
++      } else
+       stpcpy (cp, cmd->infile);
+     }
diff --git a/toolchain/eglibc/patches/2.14/110-fix_cross_zic.patch b/toolchain/eglibc/patches/2.14/110-fix_cross_zic.patch
new file mode 100644 (file)
index 0000000..221eb28
--- /dev/null
@@ -0,0 +1,27 @@
+--- a/libc/timezone/zic.c
++++ b/libc/timezone/zic.c
+@@ -8,6 +8,8 @@ static char    elsieid[] = "@(#)zic.c  8.19"
+ #ifdef CROSS_ZIC
+ #define REPORT_BUGS_TO ""
+ #define PKGVERSION ""
++#undef _
++#define _(X) (X)
+ #else
+ #include "config.h"
+ #endif
+@@ -490,6 +492,7 @@ char *     argv[];
+ #ifdef unix
+       (void) umask(umask(S_IWGRP | S_IWOTH) | (S_IWGRP | S_IWOTH));
+ #endif /* defined unix */
++#ifndef CROSS_ZIC
+ #if HAVE_GETTEXT
+       (void) setlocale(LC_ALL, "");
+ #ifdef TZ_DOMAINDIR
+@@ -497,6 +500,7 @@ char *     argv[];
+ #endif /* defined TEXTDOMAINDIR */
+       (void) textdomain(TZ_DOMAIN);
+ #endif /* HAVE_GETTEXT */
++#endif
+       progname = argv[0];
+       if (TYPE_BIT(zic_t) < 64) {
+               (void) fprintf(stderr, "%s: %s\n", progname,
diff --git a/toolchain/eglibc/patches/2.14/200-add-dl-search-paths.patch b/toolchain/eglibc/patches/2.14/200-add-dl-search-paths.patch
new file mode 100644 (file)
index 0000000..91ef61b
--- /dev/null
@@ -0,0 +1,16 @@
+add /usr/lib to default search path for the dynamic linker
+
+diff --git a/libc/Makeconfig b/libc/Makeconfig
+index 1a9ad87..2d4d3f7 100644
+--- a/libc/Makeconfig
++++ b/libc/Makeconfig
+@@ -479,6 +479,9 @@ else
+ default-rpath = $(libdir)
+ endif
++# Add /usr/lib to default search path for the dynamic linker
++user-defined-trusted-dirs := /usr/lib
++
+ ifndef link-extra-libs
+ link-extra-libs = $(LDLIBS-$(@F))
+ link-extra-libs-static = $(link-extra-libs)