summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Wessel <jason.wessel@windriver.com>2012-06-08 21:57:56 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-06-11 12:49:52 (GMT)
commita166085ff31efe7f1ef604f10aaad1294fced5e0 (patch)
treef4afec6418264045e8f0267e88f937de350f245b
parent616fab3981c3497559bd248ef18e8a26e1f3a2e0 (diff)
downloadpoky-a166085ff31efe7f1ef604f10aaad1294fced5e0.tar.gz
v86d: Fix cross link using host-cross ar
If building on 32bit host and creating 64bit libraries, the target package builds should not invoke the 32bit hosts's ar. Specifically you will get an error message like: x86_64-linux-gcc -m64 --sysroot=/opt/qemux86-64/tmp/sysroots/qemux86-64 -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Llibs/x86emu v86_x86emu.o v86_mem.o v86_common.o v86.o -lx86emu -o v86d libs/x86emu/libx86emu.a: could not read symbols: Archive has no index; run ranlib to add one collect2: error: ld returned 1 exit status (From OE-Core rev: 4bb926513084dfa6ebf5598a177239315530276e) Signed-off-by: Jason Wessel <jason.wessel@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-bsp/v86d/v86d/ar-from-env.patch33
-rw-r--r--meta/recipes-bsp/v86d/v86d_0.1.10.bb5
2 files changed, 36 insertions, 2 deletions
diff --git a/meta/recipes-bsp/v86d/v86d/ar-from-env.patch b/meta/recipes-bsp/v86d/v86d/ar-from-env.patch
new file mode 100644
index 0000000..1dcbc71
--- /dev/null
+++ b/meta/recipes-bsp/v86d/v86d/ar-from-env.patch
@@ -0,0 +1,33 @@
1Fix cross link using host-cross ar
2
3If building on 32bit host and creating 64bit libraries, the target
4package builds should not invoke the 32bit hosts's ar. Specifically
5you will get an error message like:
6
7x86_64-linux-gcc -m64 --sysroot=/opt/qemux86-64/tmp/sysroots/qemux86-64 -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -Llibs/x86emu v86_x86emu.o v86_mem.o v86_common.o v86.o -lx86emu -o v86d
8libs/x86emu/libx86emu.a: could not read symbols: Archive has no index; run ranlib to add one
9collect2: error: ld returned 1 exit status
10
11Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
12
13Upstream-Status: Pending
14
15---
16 libs/x86emu/Makefile | 6 +++++-
17 1 file changed, 5 insertions(+), 1 deletion(-)
18
19--- a/libs/x86emu/Makefile
20+++ b/libs/x86emu/Makefile
21@@ -1,7 +1,11 @@
22 OBJS = decode.o fpu.o ops.o ops2.o prim_ops.o sys.o
23
24+ifeq ($(AR),)
25+ AR = ar
26+endif
27+
28 libx86emu.a: $(OBJS)
29- ar rv $@ $+
30+ $(AR) rv $@ $+
31
32 %.o: %.c
33 $(CC) -c $(CFLAGS) -o $@ $<
diff --git a/meta/recipes-bsp/v86d/v86d_0.1.10.bb b/meta/recipes-bsp/v86d/v86d_0.1.10.bb
index 70db6ad..ce1fe7a 100644
--- a/meta/recipes-bsp/v86d/v86d_0.1.10.bb
+++ b/meta/recipes-bsp/v86d/v86d_0.1.10.bb
@@ -7,10 +7,11 @@ LIC_FILES_CHKSUM = "file://README;md5=94ac1971e4f2309dc322d598e7b1f7dd"
7 7
8DEPENDS = "virtual/kernel" 8DEPENDS = "virtual/kernel"
9RRECOMMENDS_${PN} = "kernel-module-uvesafb" 9RRECOMMENDS_${PN} = "kernel-module-uvesafb"
10PR = "r0" 10PR = "r1"
11 11
12SRC_URI = "http://dev.gentoo.org/~spock/projects/uvesafb/archive/v86d-${PV}.tar.bz2 \ 12SRC_URI = "http://dev.gentoo.org/~spock/projects/uvesafb/archive/v86d-${PV}.tar.bz2 \
13 file://fbsetup" 13 file://fbsetup \
14 file://ar-from-env.patch"
14 15
15SRC_URI[md5sum] = "51c792ba7b874ad8c43f0d3da4cfabe0" 16SRC_URI[md5sum] = "51c792ba7b874ad8c43f0d3da4cfabe0"
16SRC_URI[sha256sum] = "634964ae18ef68c8493add2ce150e3b4502badeb0d9194b4bd81241d25e6735c" 17SRC_URI[sha256sum] = "634964ae18ef68c8493add2ce150e3b4502badeb0d9194b4bd81241d25e6735c"