diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2011-03-29 12:55:18 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-04-04 23:56:31 +0100 |
commit | f897723207b00b4c9dcdb43107891b7b82ce22f3 (patch) | |
tree | d429a853ef252a1cf887c822535012c33ebf4d26 /meta/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig_aux-cache_path_fix.patch | |
parent | 1418414e9d8d5ebbf38b95be8c0ce83dbe4b525f (diff) | |
download | poky-f897723207b00b4c9dcdb43107891b7b82ce22f3.tar.gz |
ldconfig-native-2.12.1: newer recipe with eglibc sources
This fixes [YOCTO #780]
Handle the input/output data with different endian-ness correctly
Also fix the definition of LD_SO for cross environment
And remove the older 2.5 version of ldconfig-native recipe
(From OE-Core rev: 694db055f3729662e0e0193a31f2098be599877f)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig_aux-cache_path_fix.patch')
-rw-r--r-- | meta/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig_aux-cache_path_fix.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/meta/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig_aux-cache_path_fix.patch b/meta/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig_aux-cache_path_fix.patch new file mode 100644 index 0000000000..0312ca8833 --- /dev/null +++ b/meta/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig_aux-cache_path_fix.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | Coming from this bug: http://sourceware.org/bugzilla/show_bug.cgi?id=11149 | ||
2 | |||
3 | Nitin A Kamble <nitin.a.kamble@intel.com>2011/03/29 | ||
4 | |||
5 | --- ldconfig-native-2.12.1.orig/ldconfig.c | ||
6 | +++ ldconfig-native-2.12.1/ldconfig.c | ||
7 | @@ -1359,14 +1359,9 @@ main (int argc, char **argv) | ||
8 | |||
9 | const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE; | ||
10 | if (opt_chroot) | ||
11 | - { | ||
12 | - aux_cache_file = chroot_canon (opt_chroot, aux_cache_file); | ||
13 | - if (aux_cache_file == NULL) | ||
14 | - error (EXIT_FAILURE, errno, _("Can't open cache file %s\n"), | ||
15 | - _PATH_LDCONFIG_AUX_CACHE); | ||
16 | - } | ||
17 | + aux_cache_file = chroot_canon (opt_chroot, aux_cache_file); | ||
18 | |||
19 | - if (! opt_ignore_aux_cache) | ||
20 | + if (! opt_ignore_aux_cache && aux_cache_file) | ||
21 | load_aux_cache (aux_cache_file); | ||
22 | else | ||
23 | init_aux_cache (); | ||
24 | @@ -1376,7 +1371,8 @@ main (int argc, char **argv) | ||
25 | if (opt_build_cache) | ||
26 | { | ||
27 | save_cache (cache_file); | ||
28 | - save_aux_cache (aux_cache_file); | ||
29 | + if (aux_cache_file) | ||
30 | + save_aux_cache (aux_cache_file); | ||
31 | } | ||
32 | |||
33 | return 0; | ||
34 | |||