eglibc-cross.patch 2.6 KB

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364656667686970717273747576
  1. diff -Nur eglibc-2.11.1.orig/libc/sunrpc/rpc/types.h eglibc-2.11.1/libc/sunrpc/rpc/types.h
  2. --- eglibc-2.11.1.orig/libc/sunrpc/rpc/types.h 2010-02-24 08:09:59.000000000 +0100
  3. +++ eglibc-2.11.1/libc/sunrpc/rpc/types.h 2010-03-22 18:30:14.944408497 +0100
  4. @@ -68,6 +68,7 @@
  5. #include <sys/types.h>
  6. #endif
  7. +#if !defined(_CROSS_RPCGEN_)
  8. #ifndef __u_char_defined
  9. typedef __u_char u_char;
  10. typedef __u_short u_short;
  11. @@ -83,6 +84,7 @@
  12. typedef __caddr_t caddr_t;
  13. # define __daddr_t_defined
  14. #endif
  15. +#endif
  16. #include <sys/time.h>
  17. #include <sys/param.h>
  18. diff -Nur eglibc-2.11.1.orig/libc/sunrpc/rpc_clntout.c eglibc-2.11.1/libc/sunrpc/rpc_clntout.c
  19. --- eglibc-2.11.1.orig/libc/sunrpc/rpc_clntout.c 2010-02-24 08:10:01.000000000 +0100
  20. +++ eglibc-2.11.1/libc/sunrpc/rpc_clntout.c 2010-03-22 18:30:38.973160151 +0100
  21. @@ -31,7 +31,7 @@
  22. */
  23. #include <stdio.h>
  24. #include <string.h>
  25. -#include <rpc/types.h>
  26. +#include "rpc/types.h"
  27. #include "rpc_parse.h"
  28. #include "rpc_util.h"
  29. #include "proto.h"
  30. diff -Nur eglibc-2.11.1.orig/libc/sunrpc/rpc_main.c eglibc-2.11.1/libc/sunrpc/rpc_main.c
  31. --- eglibc-2.11.1.orig/libc/sunrpc/rpc_main.c 2010-02-24 08:10:00.000000000 +0100
  32. +++ eglibc-2.11.1/libc/sunrpc/rpc_main.c 2010-03-22 18:31:31.245661003 +0100
  33. @@ -37,7 +37,11 @@
  34. #include <stdio.h>
  35. #include <string.h>
  36. #include <unistd.h>
  37. +#ifdef _CROSS_RPCGEN_
  38. +#define gettext(X) (X)
  39. +#else
  40. #include <libintl.h>
  41. +#endif
  42. #include <ctype.h>
  43. #include <sys/types.h>
  44. #include <sys/param.h>
  45. diff -Nur eglibc-2.11.1.orig/libc/sunrpc/rpc_scan.c eglibc-2.11.1/libc/sunrpc/rpc_scan.c
  46. --- eglibc-2.11.1.orig/libc/sunrpc/rpc_scan.c 2010-02-24 08:10:00.000000000 +0100
  47. +++ eglibc-2.11.1/libc/sunrpc/rpc_scan.c 2010-03-22 18:31:16.146907097 +0100
  48. @@ -36,7 +36,11 @@
  49. #include <stdio.h>
  50. #include <ctype.h>
  51. #include <string.h>
  52. +#ifdef _CROSS_RPCGEN_
  53. +#define gettext(X) (X)
  54. +#else
  55. #include <libintl.h>
  56. +#endif
  57. #include "rpc_scan.h"
  58. #include "rpc_parse.h"
  59. #include "rpc_util.h"
  60. diff -Nur eglibc-2.11.1.orig/libc/timezone/Makefile eglibc-2.11.1/libc/timezone/Makefile
  61. --- eglibc-2.11.1.orig/libc/timezone/Makefile 2010-02-24 08:09:02.000000000 +0100
  62. +++ eglibc-2.11.1/libc/timezone/Makefile 2010-03-22 18:50:04.134408513 +0100
  63. @@ -181,8 +182,9 @@
  64. $(objpfx)zic: $(addprefix $(objpfx), $(zic-objs))
  65. $(addprefix $(objpfx)cross-,$(zic-objs)): $(objpfx)cross-%.o: %.c
  66. - gcc $< -c $(OUTPUT_OPTION) $(CFLAGS-$*.c) $(CPPFLAGS-$*) \
  67. - -DCROSS_ZIC $(compile-mkdep-flags)
  68. + gcc $< -c $(OUTPUT_OPTION) \
  69. + $(filter-out -DHAVE_GETTEXT,$(CFLAGS-$*.c)) \
  70. + $(CPPFLAGS-$*) -DCROSS_ZIC $(compile-mkdep-flags)
  71. $(objpfx)cross-zic: $(addprefix $(objpfx)cross-,$(zic-objs))
  72. gcc $(addprefix $(objpfx)cross-,$(zic-objs)) -o $@