summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2014-10-24 09:24:58 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-10-30 13:01:21 +0000
commit55d66edd36b4884100e49f9fa08555c91b7f91c3 (patch)
tree0e79865ab564a3b101db208cac6595f372a8dcfe
parentb8740fd5ec9b4928bd934ee5042b6f11e390db63 (diff)
downloadpoky-55d66edd36b4884100e49f9fa08555c91b7f91c3.tar.gz
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>
-rw-r--r--meta/classes/image-mklibs.bbclass2
-rw-r--r--meta/recipes-devtools/mklibs/files/sysrooted-ldso.patch18
-rw-r--r--meta/recipes-devtools/mklibs/mklibs-native_0.1.39.bb1
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() {
16 > ${WORKDIR}/mklibs/executables.list 16 > ${WORKDIR}/mklibs/executables.list
17 17
18 case ${TARGET_ARCH} in 18 case ${TARGET_ARCH} in
19 powerpc | mips | microblaze ) 19 powerpc | mips | mipsel | microblaze )
20 dynamic_loader="${base_libdir}/ld.so.1" 20 dynamic_loader="${base_libdir}/ld.so.1"
21 ;; 21 ;;
22 powerpc64) 22 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 @@
1In cross builds we will have to respect sysroot
2
3Signed-off-by: Khem Raj <raj.khem@gmail.com>
4Upstream-Status: Pending
5
6Index: mklibs-0.1.39/src/mklibs
7===================================================================
8--- mklibs-0.1.39.orig/src/mklibs 2014-03-01 18:25:36.000000000 +0000
9+++ mklibs-0.1.39/src/mklibs 2014-10-19 00:51:46.813534596 +0000
10@@ -495,7 +495,7 @@
11 present_symbols = {}
12 checked_libs = small_libs
13 checked_libs.extend(available_libs)
14- checked_libs.append(ldlib)
15+ checked_libs.append(sysroot + ldlib)
16 for lib in checked_libs:
17 for symbol in provided_symbols(lib):
18 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"
9SRC_URI = "http://ftp.de.debian.org/debian/pool/main/m/mklibs/${BPN}_${PV}.tar.xz \ 9SRC_URI = "http://ftp.de.debian.org/debian/pool/main/m/mklibs/${BPN}_${PV}.tar.xz \
10 file://ac_init_fix.patch\ 10 file://ac_init_fix.patch\
11 file://fix_STT_GNU_IFUNC.patch\ 11 file://fix_STT_GNU_IFUNC.patch\
12 file://sysrooted-ldso.patch \
12" 13"
13 14
14SRC_URI[md5sum] = "38a579a531401eb76f4bab4ccfb774a2" 15SRC_URI[md5sum] = "38a579a531401eb76f4bab4ccfb774a2"