<div dir="ltr">This patch actually breaks my MULTILIB build (Intel NUC platform).<br>I'll try and get some more details.<br><div><div class="gmail_extra">
<br><br><div class="gmail_quote">On Mon, May 5, 2014 at 12:30 PM, Ming Liu <span dir="ltr"><<a href="mailto:ming.liu@windriver.com" target="_blank">ming.liu@windriver.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
make ldconfig default to /lib+/usr/lib, /lib32+/usr/lib32 and<br>
/lib64+/usr/lib64 on bi-ABI architectures.<br>
<br>
Signed-off-by: Ming Liu <<a href="mailto:ming.liu@windriver.com">ming.liu@windriver.com</a>><br>
---<br>
.../ldconfig-default-to-all-multilib-dirs.patch | 37 ++++++++++++++++++++++<br>
meta/recipes-core/eglibc/<a href="http://ldconfig-native_2.12.1.bb" target="_blank">ldconfig-native_2.12.1.bb</a> | 4 ++-<br>
2 files changed, 40 insertions(+), 1 deletion(-)<br>
create mode 100644 meta/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig-default-to-all-multilib-dirs.patch<br>
<br>
diff --git a/meta/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig-default-to-all-multilib-dirs.patch b/meta/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig-default-to-all-multilib-dirs.patch<br>
new file mode 100644<br>
index 0000000..5ed4f6f<br>
--- /dev/null<br>
+++ b/meta/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig-default-to-all-multilib-dirs.patch<br>
@@ -0,0 +1,37 @@<br>
+Upstream-Status: Inappropriate [embedded specific]<br>
+<br>
+make ldconfig default to both /lib+/usr/lib, /lib32+/usr/lib32 and<br>
+/lib64+/usr/lib64 on bi-ABI architectures.<br>
+<br>
+---<br>
+ ldconfig.c | 10 ++++++++++<br>
+ 1 file changed, 10 insertions(+)<br>
+<br>
+diff -urpN a/ldconfig.c b/ldconfig.c<br>
+--- a/ldconfig.c<br>
++++ b/ldconfig.c<br>
+@@ -52,7 +52,11 @@<br>
+<br>
+ #define SYSCONFDIR "/etc"<br>
+ #define LIBDIR "/usr/lib"<br>
++#define LIBDIR32 "/usr/lib32"<br>
++#define LIBDIR64 "/usr/lib64"<br>
+ #define SLIBDIR "/lib"<br>
++#define SLIBDIR32 "/lib32"<br>
++#define SLIBDIR64 "/lib64"<br>
+ # define N_(msgid) msgid<br>
+ #define _(msg) msg<br>
+<br>
+@@ -1373,6 +1377,12 @@ main (int argc, char **argv)<br>
+ add_system_dir (SLIBDIR);<br>
+ if (strcmp (SLIBDIR, LIBDIR))<br>
+ add_system_dir (LIBDIR);<br>
++ add_system_dir (SLIBDIR32);<br>
++ if (strcmp (SLIBDIR32, LIBDIR32))<br>
++ add_system_dir (LIBDIR32);<br>
++ add_system_dir (SLIBDIR64);<br>
++ if (strcmp (SLIBDIR64, LIBDIR64))<br>
++ add_system_dir (LIBDIR64);<br>
+ }<br>
+<br>
+ const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE;<br>
diff --git a/meta/recipes-core/eglibc/<a href="http://ldconfig-native_2.12.1.bb" target="_blank">ldconfig-native_2.12.1.bb</a> b/meta/recipes-core/eglibc/<a href="http://ldconfig-native_2.12.1.bb" target="_blank">ldconfig-native_2.12.1.bb</a><br>
index d7bc444..75ffbf6 100644<br>
--- a/meta/recipes-core/eglibc/<a href="http://ldconfig-native_2.12.1.bb" target="_blank">ldconfig-native_2.12.1.bb</a><br>
+++ b/meta/recipes-core/eglibc/<a href="http://ldconfig-native_2.12.1.bb" target="_blank">ldconfig-native_2.12.1.bb</a><br>
@@ -10,7 +10,9 @@ SRC_URI = "file://ldconfig-native-2.12.1.tar.bz2 \<br>
file://32and64bit.patch \<br>
file://endian-ness_handling.patch \<br>
file://flag_fix.patch \<br>
- file://endianess-header.patch"<br>
+ file://endianess-header.patch \<br>
+ file://ldconfig-default-to-all-multilib-dirs.patch \<br>
+"<br>
<br>
PR = "r2"<br>
<span class="HOEnZb"><font color="#888888"><br>
--<br>
1.8.4.1<br>
<br>
--<br>
_______________________________________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" target="_blank">http://lists.openembedded.org/mailman/listinfo/openembedded-core</a><br>
</font></span></blockquote></div><br></div></div></div>