summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMing Liu <ming.liu@windriver.com>2014-05-05 10:30:33 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-06 17:59:17 +0100
commitb84d7915dd0adbdf06008c1fd6f8b4e6991e7e08 (patch)
tree18d1d7fd1638eccffefbd1aa8ad8674ada655d9c
parente32543e0d01b30d9d8ad9e896b93b92500ee4bb9 (diff)
downloadpoky-b84d7915dd0adbdf06008c1fd6f8b4e6991e7e08.tar.gz
ldconfig-native: also default to lib32 and lib64 directories
make ldconfig default to /lib+/usr/lib, /lib32+/usr/lib32 and /lib64+/usr/lib64 on bi-ABI architectures. (From OE-Core rev: c90bb98d4ac14562ef4882691daed3aaa9d08504) Signed-off-by: Ming Liu <ming.liu@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig-default-to-all-multilib-dirs.patch37
-rw-r--r--meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb4
2 files changed, 40 insertions, 1 deletions
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
new file mode 100644
index 0000000000..5ed4f6ff69
--- /dev/null
+++ b/meta/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig-default-to-all-multilib-dirs.patch
@@ -0,0 +1,37 @@
1Upstream-Status: Inappropriate [embedded specific]
2
3make ldconfig default to both /lib+/usr/lib, /lib32+/usr/lib32 and
4/lib64+/usr/lib64 on bi-ABI architectures.
5
6---
7 ldconfig.c | 10 ++++++++++
8 1 file changed, 10 insertions(+)
9
10diff -urpN a/ldconfig.c b/ldconfig.c
11--- a/ldconfig.c
12+++ b/ldconfig.c
13@@ -52,7 +52,11 @@
14
15 #define SYSCONFDIR "/etc"
16 #define LIBDIR "/usr/lib"
17+#define LIBDIR32 "/usr/lib32"
18+#define LIBDIR64 "/usr/lib64"
19 #define SLIBDIR "/lib"
20+#define SLIBDIR32 "/lib32"
21+#define SLIBDIR64 "/lib64"
22 # define N_(msgid) msgid
23 #define _(msg) msg
24
25@@ -1373,6 +1377,12 @@ main (int argc, char **argv)
26 add_system_dir (SLIBDIR);
27 if (strcmp (SLIBDIR, LIBDIR))
28 add_system_dir (LIBDIR);
29+ add_system_dir (SLIBDIR32);
30+ if (strcmp (SLIBDIR32, LIBDIR32))
31+ add_system_dir (LIBDIR32);
32+ add_system_dir (SLIBDIR64);
33+ if (strcmp (SLIBDIR64, LIBDIR64))
34+ add_system_dir (LIBDIR64);
35 }
36
37 const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE;
diff --git a/meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb b/meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb
index d7bc4446a8..75ffbf615a 100644
--- a/meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb
+++ b/meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb
@@ -10,7 +10,9 @@ SRC_URI = "file://ldconfig-native-2.12.1.tar.bz2 \
10 file://32and64bit.patch \ 10 file://32and64bit.patch \
11 file://endian-ness_handling.patch \ 11 file://endian-ness_handling.patch \
12 file://flag_fix.patch \ 12 file://flag_fix.patch \
13 file://endianess-header.patch" 13 file://endianess-header.patch \
14 file://ldconfig-default-to-all-multilib-dirs.patch \
15"
14 16
15PR = "r2" 17PR = "r2"
16 18