summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2010-11-16 16:41:49 -0800
committerSaul Wold <Saul.Wold@intel.com>2010-11-18 10:38:35 -0800
commit771d890d086534536ff4aa4a386f17e2b697c0be (patch)
tree7c932d867c8dbc11d3d65b007aeb6ebcbf670820
parenteaa188f3b9c68a81fa845de7dcdce68e01d0d2d3 (diff)
downloadpoky-771d890d086534536ff4aa4a386f17e2b697c0be.tar.gz
eglibc: rebase a nativesdk patch to the newer code
After the eglibc svn commit bumping, this nativesdk recipe's patch is failing. This commit rebases it to the newer code. and bump PR. Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
-rw-r--r--meta/recipes-core/eglibc/eglibc-2.12/ld-search-order.patch16
-rw-r--r--meta/recipes-core/eglibc/eglibc_2.12.bb2
2 files changed, 9 insertions, 9 deletions
diff --git a/meta/recipes-core/eglibc/eglibc-2.12/ld-search-order.patch b/meta/recipes-core/eglibc/eglibc-2.12/ld-search-order.patch
index e00f02a55c..f968678efb 100644
--- a/meta/recipes-core/eglibc/eglibc-2.12/ld-search-order.patch
+++ b/meta/recipes-core/eglibc/eglibc-2.12/ld-search-order.patch
@@ -19,25 +19,25 @@ RP 14/10/2010
19 19
20Index: libc/elf/dl-load.c 20Index: libc/elf/dl-load.c
21=================================================================== 21===================================================================
22--- libc.orig/elf/dl-load.c 2010-10-14 11:34:54.944365484 +0100 22--- libc.orig/elf/dl-load.c
23+++ libc/elf/dl-load.c 2010-10-14 11:35:53.000000000 +0100 23+++ libc/elf/dl-load.c
24@@ -2105,6 +2105,15 @@ 24@@ -2107,6 +2107,15 @@ _dl_map_object (struct link_map *loader,
25 &loader->l_runpath_dirs, &realname, &fb, loader, 25 &loader->l_runpath_dirs, &realname, &fb, loader,
26 LA_SER_RUNPATH, &found_other_class); 26 LA_SER_RUNPATH, &found_other_class);
27 27
28+ /* Try the default path. */ 28+ /* try the default path. */
29+ if (fd == -1 29+ if (fd == -1
30+ && ((l = loader ?: GL(dl_ns)[nsid]._ns_loaded) == NULL 30+ && ((l = loader ?: GL(dl_ns)[nsid]._ns_loaded) == NULL
31+ || __builtin_expect (!(l->l_flags_1 & DF_1_NODEFLIB), 1)) 31+ || __builtin_expect (!(l->l_flags_1 & DF_1_NODEFLIB), 1))
32+ && rtld_search_dirs.dirs != (void *) -1) 32+ && rtld_search_dirs.dirs != (void *) -1)
33+ fd = open_path (name, namelen, preloaded, &rtld_search_dirs, 33+ fd = open_path (name, namelen, mode & __RTLD_SECURE, &rtld_search_dirs,
34+ &realname, &fb, l, LA_SER_DEFAULT, &found_other_class); 34+ &realname, &fb, l, LA_SER_DEFAULT, &found_other_class);
35+ 35+
36+ /* Finally try ld.so.cache */ 36+ /* Finally try ld.so.cache */
37 if (fd == -1 37 if (fd == -1
38 && (__builtin_expect (! preloaded, 1) 38 && (__builtin_expect (! (mode & __RTLD_SECURE), 1)
39 || ! INTUSE(__libc_enable_secure))) 39 || ! INTUSE(__libc_enable_secure)))
40@@ -2167,14 +2176,6 @@ 40@@ -2169,14 +2178,6 @@ _dl_map_object (struct link_map *loader,
41 } 41 }
42 } 42 }
43 43
@@ -46,7 +46,7 @@ Index: libc/elf/dl-load.c
46- && ((l = loader ?: GL(dl_ns)[nsid]._ns_loaded) == NULL 46- && ((l = loader ?: GL(dl_ns)[nsid]._ns_loaded) == NULL
47- || __builtin_expect (!(l->l_flags_1 & DF_1_NODEFLIB), 1)) 47- || __builtin_expect (!(l->l_flags_1 & DF_1_NODEFLIB), 1))
48- && rtld_search_dirs.dirs != (void *) -1) 48- && rtld_search_dirs.dirs != (void *) -1)
49- fd = open_path (name, namelen, preloaded, &rtld_search_dirs, 49- fd = open_path (name, namelen, mode & __RTLD_SECURE, &rtld_search_dirs,
50- &realname, &fb, l, LA_SER_DEFAULT, &found_other_class); 50- &realname, &fb, l, LA_SER_DEFAULT, &found_other_class);
51- 51-
52 /* Add another newline when we are tracing the library loading. */ 52 /* Add another newline when we are tracing the library loading. */
diff --git a/meta/recipes-core/eglibc/eglibc_2.12.bb b/meta/recipes-core/eglibc/eglibc_2.12.bb
index fa6e6c3ab9..3d0dc7387a 100644
--- a/meta/recipes-core/eglibc/eglibc_2.12.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.12.bb
@@ -2,7 +2,7 @@ require eglibc.inc
2 2
3DEPENDS += "gperf-native" 3DEPENDS += "gperf-native"
4FILESPATHPKG =. "eglibc-svn:" 4FILESPATHPKG =. "eglibc-svn:"
5PR = "r11" 5PR = "r12"
6 6
7EGLIBC_BRANCH="eglibc-2_12" 7EGLIBC_BRANCH="eglibc-2_12"
8SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=http \ 8SRC_URI = "svn://www.eglibc.org/svn/branches/;module=${EGLIBC_BRANCH};proto=http \