diff options
author | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-03-04 16:34:07 +0000 |
---|---|---|
committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-03-04 16:34:07 +0000 |
commit | 68e4dbb0ebd1a6ca420cb98ff25db7c01030624c (patch) | |
tree | 17f63f3cc76e7226c7cbe98363d7fe14f8da5864 /meta/packages/glibc/glibc-2.4 | |
parent | 4c117c12857ff176faee157b49250e0a12895de7 (diff) | |
download | poky-68e4dbb0ebd1a6ca420cb98ff25db7c01030624c.tar.gz |
glibc: added 2.6.1 from OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3903 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/glibc/glibc-2.4')
-rw-r--r-- | meta/packages/glibc/glibc-2.4/ldd-unbash.patch | 11 | ||||
-rw-r--r-- | meta/packages/glibc/glibc-2.4/local-stdio-lock.diff | 34 |
2 files changed, 45 insertions, 0 deletions
diff --git a/meta/packages/glibc/glibc-2.4/ldd-unbash.patch b/meta/packages/glibc/glibc-2.4/ldd-unbash.patch new file mode 100644 index 0000000000..2fb8854b49 --- /dev/null +++ b/meta/packages/glibc/glibc-2.4/ldd-unbash.patch | |||
@@ -0,0 +1,11 @@ | |||
1 | --- glibc-2.5/elf/ldd.bash.in.org 2006-04-30 16:06:20.000000000 +0000 | ||
2 | +++ glibc-2.5/elf/ldd.bash.in 2007-03-30 19:18:57.000000000 +0000 | ||
3 | @@ -110,7 +110,7 @@ | ||
4 | # environments where the executed program might not have permissions | ||
5 | # to write to the console/tty. But only bash 3.x supports the pipefail | ||
6 | # option, and we don't bother to handle the case for older bash versions. | ||
7 | -if set -o pipefail 2> /dev/null; then | ||
8 | +if false; then | ||
9 | try_trace() { | ||
10 | eval $add_env '"$@"' | cat | ||
11 | } | ||
diff --git a/meta/packages/glibc/glibc-2.4/local-stdio-lock.diff b/meta/packages/glibc/glibc-2.4/local-stdio-lock.diff new file mode 100644 index 0000000000..65cd2fd6b4 --- /dev/null +++ b/meta/packages/glibc/glibc-2.4/local-stdio-lock.diff | |||
@@ -0,0 +1,34 @@ | |||
1 | --- | ||
2 | bits/stdio-lock.h | 17 +++++++++++++---- | ||
3 | 1 file changed, 13 insertions(+), 4 deletions(-) | ||
4 | |||
5 | --- glibc-2.7.orig/bits/stdio-lock.h | ||
6 | +++ glibc-2.7/bits/stdio-lock.h | ||
7 | @@ -45,14 +45,23 @@ __libc_lock_define_recursive (typedef, _ | ||
8 | #define _IO_cleanup_region_end(_doit) \ | ||
9 | __libc_cleanup_region_end (_doit) | ||
10 | |||
11 | #if defined _LIBC && !defined NOT_IN_libc | ||
12 | # define _IO_acquire_lock(_fp) \ | ||
13 | - _IO_cleanup_region_start ((void (*) (void *)) _IO_funlockfile, (_fp)); \ | ||
14 | - _IO_flockfile (_fp) | ||
15 | + { \ | ||
16 | + _IO_FILE *_IO_acquire_lock_file = _fp; \ | ||
17 | + __libc_cleanup_region_start (1, (void (*) (void *)) _IO_acquire_lock_fct, &_IO_acquire_lock_file); \ | ||
18 | + _IO_flockfile (_IO_acquire_lock_file) | ||
19 | + | ||
20 | +# define _IO_acquire_lock_clear_flags2(_fp) \ | ||
21 | + { \ | ||
22 | + _IO_FILE *_IO_acquire_lock_file = _fp; \ | ||
23 | + __libc_cleanup_region_start (1, (void (*) (void *)) _IO_acquire_lock_clear_flags2_fct, &_IO_acquire_lock_file); \ | ||
24 | + _IO_flockfile (_IO_acquire_lock_file) | ||
25 | |||
26 | # define _IO_release_lock(_fp) \ | ||
27 | - _IO_funlockfile (_fp); \ | ||
28 | - _IO_cleanup_region_end (0) | ||
29 | + __libc_cleanup_region_end (1); \ | ||
30 | + } | ||
31 | + | ||
32 | #endif | ||
33 | |||
34 | #endif /* bits/stdio-lock.h */ | ||