diff options
author | Adrian Dudau <adrian.dudau@enea.com> | 2014-06-26 14:36:22 +0200 |
---|---|---|
committer | Adrian Dudau <adrian.dudau@enea.com> | 2014-06-26 15:32:53 +0200 |
commit | f4cf9fe05bb3f32fabea4e54dd92d368967a80da (patch) | |
tree | 487180fa9866985ea7b28e625651765d86f515c3 /meta/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig_aux-cache_path_fix.patch | |
download | poky-f4cf9fe05bb3f32fabea4e54dd92d368967a80da.tar.gz |
initial commit for Enea Linux 4.0
Migrated from the internal git server on the daisy-enea branch
Signed-off-by: Adrian Dudau <adrian.dudau@enea.com>
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 | 36 |
1 files changed, 36 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..27bc411078 --- /dev/null +++ b/meta/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig_aux-cache_path_fix.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | Coming from this bug: http://sourceware.org/bugzilla/show_bug.cgi?id=11149 | ||
4 | |||
5 | Nitin A Kamble <nitin.a.kamble@intel.com>2011/03/29 | ||
6 | |||
7 | --- ldconfig-native-2.12.1.orig/ldconfig.c | ||
8 | +++ ldconfig-native-2.12.1/ldconfig.c | ||
9 | @@ -1359,14 +1359,9 @@ main (int argc, char **argv) | ||
10 | |||
11 | const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE; | ||
12 | if (opt_chroot) | ||
13 | - { | ||
14 | - aux_cache_file = chroot_canon (opt_chroot, aux_cache_file); | ||
15 | - if (aux_cache_file == NULL) | ||
16 | - error (EXIT_FAILURE, errno, _("Can't open cache file %s\n"), | ||
17 | - _PATH_LDCONFIG_AUX_CACHE); | ||
18 | - } | ||
19 | + aux_cache_file = chroot_canon (opt_chroot, aux_cache_file); | ||
20 | |||
21 | - if (! opt_ignore_aux_cache) | ||
22 | + if (! opt_ignore_aux_cache && aux_cache_file) | ||
23 | load_aux_cache (aux_cache_file); | ||
24 | else | ||
25 | init_aux_cache (); | ||
26 | @@ -1376,7 +1371,8 @@ main (int argc, char **argv) | ||
27 | if (opt_build_cache) | ||
28 | { | ||
29 | save_cache (cache_file); | ||
30 | - save_aux_cache (aux_cache_file); | ||
31 | + if (aux_cache_file) | ||
32 | + save_aux_cache (aux_cache_file); | ||
33 | } | ||
34 | |||
35 | return 0; | ||
36 | |||