diff options
| author | Khem Raj <raj.khem@gmail.com> | 2014-10-24 09:24:58 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-31 10:17:01 +0000 |
| commit | 2c327f75c293a68c39b46d72a27248d72ac80996 (patch) | |
| tree | d4c170af34c24ba7c3713168cc9391d2af556702 | |
| parent | 267dc0429e8da7cc292034e1a5ab3eae7786db4e (diff) | |
| download | openembedded-core-2c327f75c293a68c39b46d72a27248d72ac80996.tar.gz openembedded-core-2c327f75c293a68c39b46d72a27248d72ac80996.tar.bz2 openembedded-core-2c327f75c293a68c39b46d72a27248d72ac80996.zip | |
mklibs: Fix loader for mipsel
Additionally treat ld.so to be searched in sysroot
Change-Id: I8b4acb821d9855a1163c7149bc8e369c7c438856
(From OE-Core rev: 4cf539e67333ba2c3fe924b092e104da53e68ca0)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
| -rw-r--r-- | meta/classes/image-mklibs.bbclass | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/mklibs/files/sysrooted-ldso.patch | 18 | ||||
| -rw-r--r-- | meta/recipes-devtools/mklibs/mklibs-native_0.1.39.bb | 1 |
3 files changed, 20 insertions, 1 deletions
diff --git a/meta/classes/image-mklibs.bbclass b/meta/classes/image-mklibs.bbclass index 11f082b373..c455a8e2d4 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 0000000000..75500a029a --- /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@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 ff8d5003ee..9885561fe3 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" |