mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-17 09:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

ldconfig-native: also default to lib32 and lib64 directories

Browse Source 
make ldconfig default to /lib+/usr/lib, /lib32+/usr/lib32 and
/lib64+/usr/lib64 on bi-ABI architectures.

(From OE-Core rev: c90bb98d4ac14562ef4882691daed3aaa9d08504)

(From OE-Core rev: 44202d78102fa58ba99040a79d5a61c44033f57d)

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>
This commit is contained in:
Ming Liu
2014-05-05 10:30:33 +08:00
committed by Richard Purdie
parent a1958d47c6
commit 517c2cc88d
2 changed files with 40 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
meta/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig-default-to-all-multilib-dirs.patch Normal file
View File

@@ -0,0 +1,37 @@
Upstream-Status: Inappropriate [embedded specific]
make ldconfig default to both /lib+/usr/lib, /lib32+/usr/lib32 and
/lib64+/usr/lib64 on bi-ABI architectures.
---
ldconfig.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff -urpN a/ldconfig.c b/ldconfig.c
--- a/ldconfig.c
+++ b/ldconfig.c
@@ -52,7 +52,11 @@
#define SYSCONFDIR "/etc"
#define LIBDIR "/usr/lib"
+#define LIBDIR32 "/usr/lib32"
+#define LIBDIR64 "/usr/lib64"
#define SLIBDIR "/lib"
+#define SLIBDIR32 "/lib32"
+#define SLIBDIR64 "/lib64"
# define N_(msgid) msgid
#define _(msg) msg
@@ -1373,6 +1377,12 @@ main (int argc, char **argv)
add_system_dir (SLIBDIR);
if (strcmp (SLIBDIR, LIBDIR))
add_system_dir (LIBDIR);
+ add_system_dir (SLIBDIR32);
+ if (strcmp (SLIBDIR32, LIBDIR32))
+ add_system_dir (LIBDIR32);
+ add_system_dir (SLIBDIR64);
+ if (strcmp (SLIBDIR64, LIBDIR64))
+ add_system_dir (LIBDIR64);
}
const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE;

4
meta/recipes-core/eglibc/ldconfig-native_2.12.1.bb
View File

@@ -10,7 +10,9 @@ SRC_URI = "file://ldconfig-native-2.12.1.tar.bz2 \
file://32and64bit.patch \
file://endian-ness_handling.patch \
file://flag_fix.patch \
file://endianess-header.patch"
file://endianess-header.patch \
file://ldconfig-default-to-all-multilib-dirs.patch \
"
PR = "r2"