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>
This commit is contained in:
Jason Wessel 2012-06-08 16:57:56 -05:00 committed by Richard Purdie
parent 616fab3981
commit a166085ff3
2 changed files with 36 additions and 2 deletions

View File

@ -0,0 +1,33 @@
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
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Upstream-Status: Pending
---
libs/x86emu/Makefile | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
--- a/libs/x86emu/Makefile
+++ b/libs/x86emu/Makefile
@@ -1,7 +1,11 @@
OBJS = decode.o fpu.o ops.o ops2.o prim_ops.o sys.o
+ifeq ($(AR),)
+ AR = ar
+endif
+
libx86emu.a: $(OBJS)
- ar rv $@ $+
+ $(AR) rv $@ $+
%.o: %.c
$(CC) -c $(CFLAGS) -o $@ $<

View File

@ -7,10 +7,11 @@ LIC_FILES_CHKSUM = "file://README;md5=94ac1971e4f2309dc322d598e7b1f7dd"
DEPENDS = "virtual/kernel"
RRECOMMENDS_${PN} = "kernel-module-uvesafb"
PR = "r0"
PR = "r1"
SRC_URI = "http://dev.gentoo.org/~spock/projects/uvesafb/archive/v86d-${PV}.tar.bz2 \
file://fbsetup"
file://fbsetup \
file://ar-from-env.patch"
SRC_URI[md5sum] = "51c792ba7b874ad8c43f0d3da4cfabe0"
SRC_URI[sha256sum] = "634964ae18ef68c8493add2ce150e3b4502badeb0d9194b4bd81241d25e6735c"