| [d8f87e8] | 1 | Submitted By: Jim Gifford (jim at cross-lfs dot org) | 
|---|
|  | 2 | Date: 06-07-2009 | 
|---|
|  | 3 | Initial Package Version: 2.10.1 | 
|---|
|  | 4 | Origin: Upstream | 
|---|
|  | 5 | Upstream Status: Applied | 
|---|
|  | 6 | Description: These are fixes eglibc-2.10.1, and should be | 
|---|
|  | 7 | rechecked periodically. | 
|---|
|  | 8 |  | 
|---|
|  | 9 | diff -Naur libc.orig/elf/ldd.bash.in libc/elf/ldd.bash.in | 
|---|
|  | 10 | --- libc.orig/elf/ldd.bash.in   2009-02-13 18:31:14.000000000 +0000 | 
|---|
|  | 11 | +++ libc/elf/ldd.bash.in        2009-06-07 23:26:18.000000000 +0000 | 
|---|
|  | 12 | @@ -1,4 +1,4 @@ | 
|---|
|  | 13 | -#! @BASH@ | 
|---|
|  | 14 | +#! /bin/bash | 
|---|
|  | 15 | # Copyright (C) 1996-2008, 2009 Free Software Foundation, Inc. | 
|---|
|  | 16 | # This file is part of the GNU C Library. | 
|---|
|  | 17 |  | 
|---|
|  | 18 | diff -Naur libc.orig/libio/Makefile libc/libio/Makefile | 
|---|
|  | 19 | --- libc.orig/libio/Makefile    2009-02-05 14:29:56.000000000 +0000 | 
|---|
|  | 20 | +++ libc/libio/Makefile 2009-06-07 23:26:18.000000000 +0000 | 
|---|
|  | 21 | @@ -170,6 +170,7 @@ | 
|---|
|  | 22 | tst-fopenloc-ENV = LOCPATH=$(common-objpfx)localedata \ | 
|---|
|  | 23 | MALLOC_TRACE=$(objpfx)tst-fopenloc.mtrace | 
|---|
|  | 24 | tst-fgetws-ENV = LOCPATH=$(common-objpfx)localedata | 
|---|
|  | 25 | +tst-fgetwc-ENV = LOCPATH=$(common-objpfx)localedata | 
|---|
|  | 26 | tst-ungetwc1-ENV = LOCPATH=$(common-objpfx)localedata | 
|---|
|  | 27 | tst-ungetwc2-ENV = LOCPATH=$(common-objpfx)localedata | 
|---|
|  | 28 | bug-ungetwc2-ENV = LOCPATH=$(common-objpfx)localedata | 
|---|
|  | 29 | diff -Naur libc.orig/libio/tst-fgetwc.c libc/libio/tst-fgetwc.c | 
|---|
|  | 30 | --- libc.orig/libio/tst-fgetwc.c        2009-02-05 14:29:56.000000000 +0000 | 
|---|
|  | 31 | +++ libc/libio/tst-fgetwc.c     2009-06-07 23:26:18.000000000 +0000 | 
|---|
|  | 32 | @@ -6,7 +6,7 @@ | 
|---|
|  | 33 | static int | 
|---|
|  | 34 | do_test (void) | 
|---|
|  | 35 | { | 
|---|
|  | 36 | -  if (setlocale (LC_ALL, "de_DE.utf8") == NULL) | 
|---|
|  | 37 | +  if (setlocale (LC_ALL, "de_DE.UTF-8") == NULL) | 
|---|
|  | 38 | { | 
|---|
|  | 39 | puts ("setlocale failed"); | 
|---|
|  | 40 | return 1; | 
|---|
|  | 41 | diff -Naur libc.orig/sunrpc/Makefile libc/sunrpc/Makefile | 
|---|
|  | 42 | --- libc.orig/sunrpc/Makefile   2008-04-25 11:12:05.000000000 +0000 | 
|---|
|  | 43 | +++ libc/sunrpc/Makefile        2009-06-07 23:26:18.000000000 +0000 | 
|---|
|  | 44 | @@ -144,11 +144,11 @@ | 
|---|
|  | 45 | $(+link) | 
|---|
|  | 46 |  | 
|---|
|  | 47 | $(addprefix $(objpfx)cross-,$(rpcgen-objs)): $(objpfx)cross-%.o: %.c | 
|---|
|  | 48 | -       gcc $< -c -D_RPC_THREAD_SAFE_ -D_CROSS_RPCGEN_ \ | 
|---|
|  | 49 | +       $(BUILD_CC) $< -c -D_RPC_THREAD_SAFE_ -D_CROSS_RPCGEN_ \ | 
|---|
|  | 50 | $(OUTPUT_OPTION) $(compile-mkdep-flags) | 
|---|
|  | 51 |  | 
|---|
|  | 52 | $(objpfx)cross-rpcgen: $(addprefix $(objpfx)cross-,$(rpcgen-objs)) | 
|---|
|  | 53 | -       gcc $^ -o $@ | 
|---|
|  | 54 | +       $(BUILD_CC) $^ -o $@ | 
|---|
|  | 55 |  | 
|---|
|  | 56 | # This makes sure -DNOT_IN_libc is passed for all these modules. | 
|---|
|  | 57 | cpp-srcs-left := $(rpcgen-objs:.o=.c) | 
|---|
|  | 58 | diff -Naur libc.orig/timezone/Makefile libc/timezone/Makefile | 
|---|
|  | 59 | --- libc.orig/timezone/Makefile 2009-03-03 13:14:09.000000000 +0000 | 
|---|
|  | 60 | +++ libc/timezone/Makefile      2009-06-07 23:26:18.000000000 +0000 | 
|---|
|  | 61 | @@ -181,11 +181,11 @@ | 
|---|
|  | 62 | $(objpfx)zic: $(addprefix $(objpfx), $(zic-objs)) | 
|---|
|  | 63 |  | 
|---|
|  | 64 | $(addprefix $(objpfx)cross-,$(zic-objs)): $(objpfx)cross-%.o: %.c | 
|---|
|  | 65 | -       gcc $< -c $(OUTPUT_OPTION) $(CFLAGS-$*.c) $(CPPFLAGS-$*) \ | 
|---|
|  | 66 | +       $(BUILD_CC) $< -c $(OUTPUT_OPTION) $(CFLAGS-$*.c) $(CPPFLAGS-$*) \ | 
|---|
|  | 67 | -DCROSS_ZIC $(compile-mkdep-flags) | 
|---|
|  | 68 |  | 
|---|
|  | 69 | $(objpfx)cross-zic: $(addprefix $(objpfx)cross-,$(zic-objs)) | 
|---|
|  | 70 | -       gcc $(addprefix $(objpfx)cross-,$(zic-objs)) -o $@ | 
|---|
|  | 71 | +       $(BUILD_CC) $(addprefix $(objpfx)cross-,$(zic-objs)) -o $@ | 
|---|
|  | 72 |  | 
|---|
|  | 73 | tz-cflags = -DTZDIR='"$(zonedir)"' \ | 
|---|
|  | 74 | -DTZDEFAULT='"$(localtime-file)"' \ | 
|---|