[oe-commits] Khem Raj : mklibs: Fix loader for mipsel
git at git.openembedded.org
git at git.openembedded.org
Thu Oct 30 13:03:17 UTC 2014
Module: openembedded-core.git
Branch: master
Commit: 4cf539e67333ba2c3fe924b092e104da53e68ca0
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=4cf539e67333ba2c3fe924b092e104da53e68ca0
Author: Khem Raj <raj.khem at gmail.com>
Date: Fri Oct 24 09:24:58 2014 -0700
mklibs: Fix loader for mipsel
Additionally treat ld.so to be searched in sysroot
Change-Id: I8b4acb821d9855a1163c7149bc8e369c7c438856
Signed-off-by: Khem Raj <raj.khem at gmail.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/classes/image-mklibs.bbclass | 2 +-
.../recipes-devtools/mklibs/files/sysrooted-ldso.patch | 18 ++++++++++++++++++
meta/recipes-devtools/mklibs/mklibs-native_0.1.39.bb | 1 +
3 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/meta/classes/image-mklibs.bbclass b/meta/classes/image-mklibs.bbclass
index 11f082b..c455a8e 100644
--- a/meta/classes/image-mklibs.bbclass
+++ b/meta/classes/image-mklibs.bbclass
@@ -16,7 +16,7 @@ mklibs_optimize_image_doit() {
> ${WORKDIR}/mklibs/executables.list
case ${TARGET_ARCH} in
- powerpc | mips | microblaze )
+ powerpc | mips | mipsel | microblaze )
dynamic_loader="${base_libdir}/ld.so.1"
;;
powerpc64)
diff --git a/meta/recipes-devtools/mklibs/files/sysrooted-ldso.patch b/meta/recipes-devtools/mklibs/files/sysrooted-ldso.patch
new file mode 100644
index 0000000..75500a0
--- /dev/null
+++ b/meta/recipes-devtools/mklibs/files/sysrooted-ldso.patch
@@ -0,0 +1,18 @@
+In cross builds we will have to respect sysroot
+
+Signed-off-by: Khem Raj <raj.khem at gmail.com>
+Upstream-Status: Pending
+
+Index: mklibs-0.1.39/src/mklibs
+===================================================================
+--- mklibs-0.1.39.orig/src/mklibs 2014-03-01 18:25:36.000000000 +0000
++++ mklibs-0.1.39/src/mklibs 2014-10-19 00:51:46.813534596 +0000
+@@ -495,7 +495,7 @@
+ present_symbols = {}
+ checked_libs = small_libs
+ checked_libs.extend(available_libs)
+- checked_libs.append(ldlib)
++ checked_libs.append(sysroot + ldlib)
+ for lib in checked_libs:
+ for symbol in provided_symbols(lib):
+ debug(DEBUG_SPAM, "present_symbols adding %s" % symbol)
diff --git a/meta/recipes-devtools/mklibs/mklibs-native_0.1.39.bb b/meta/recipes-devtools/mklibs/mklibs-native_0.1.39.bb
index ff8d500..9885561 100644
--- a/meta/recipes-devtools/mklibs/mklibs-native_0.1.39.bb
+++ b/meta/recipes-devtools/mklibs/mklibs-native_0.1.39.bb
@@ -9,6 +9,7 @@ DEPENDS = "python-native dpkg-native"
SRC_URI = "http://ftp.de.debian.org/debian/pool/main/m/mklibs/${BPN}_${PV}.tar.xz \
file://ac_init_fix.patch\
file://fix_STT_GNU_IFUNC.patch\
+ file://sysrooted-ldso.patch \
"
SRC_URI[md5sum] = "38a579a531401eb76f4bab4ccfb774a2"
More information about the Openembedded-commits
mailing list