summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-07 10:46:11 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-07 10:48:20 +0000
commitd40cb4a359dbc5d762fabd996c29e468f5398dd9 (patch)
tree03198401ca7b7012db9b887f9615dedf5588612a /meta
parenta8181c2d3a9e51569d77ab2ad9950b27a1113294 (diff)
downloadopenembedded-core-d40cb4a359dbc5d762fabd996c29e468f5398dd9.tar.gz
openembedded-core-d40cb4a359dbc5d762fabd996c29e468f5398dd9.tar.bz2
openembedded-core-d40cb4a359dbc5d762fabd996c29e468f5398dd9.zip
glibc: Add relocation of GCONV_PATH
We're seeing various failures where nativesdk glibc can't find the gconv modules. We've tried various workaround but this needs fixing 'properly'. One significant problem is knowing when a binary would use this glibc and hence when to set the path and when not to. Add the default path to its own special section which the sdk relocation script already knows how to handle and remap. This significantly improves the usability of uninative. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch16
1 files changed, 13 insertions, 3 deletions
diff --git a/meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch b/meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch
index dde94b450c..60f9f17b89 100644
--- a/meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch
+++ b/meta/recipes-core/glibc/glibc/0003-nativesdk-glibc-Raise-the-size-of-arrays-containing-.patch
@@ -121,6 +121,16 @@ index 70d4aeb..5c726d0 100644
#ifndef add_system_dir
# define add_system_dir(dir) add_dir (dir)
#endif
---
-2.6.4
-
+Index: git/iconv/gconv_conf.c
+===================================================================
+--- git.orig/iconv/gconv_conf.c
++++ git/iconv/gconv_conf.c
+@@ -36,7 +36,7 @@
+
+
+ /* This is the default path where we look for module lists. */
+-static const char default_gconv_path[] = GCONV_PATH;
++static char default_gconv_path[4096] __attribute__ ((section (".gccrelocprefix"))) = GCONV_PATH;
+
+ /* The path elements, as determined by the __gconv_get_path function.
+ All path elements end in a slash. */