diff options
author | Trevor Woerner <twoerner@gmail.com> | 2013-05-07 13:37:14 -0400 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-08 15:08:12 +0100 |
commit | d6cc4edb533b196753cf90820d1e2b9ccd8fed7c (patch) | |
tree | 471d615b3cdd38ea791bb283a6aeeb4bc37f13d1 | |
parent | 094c523dedd55a859402a9a2de1160d4f1adf885 (diff) | |
download | poky-d6cc4edb533b196753cf90820d1e2b9ccd8fed7c.tar.gz |
qemu-native: fix DSO linking
I noticed this issue trying to build using the Danny branch on what is
currently the most recent openSuSE (12.3). It appears to be similar to the
fedora DSO linking issue:
https://fedoraproject.org/wiki/UnderstandingDSOLinkChange.
Upstream-status: Inappropriate [OE Specific]
(From OE-Core rev: c0ed6d8017eb83321dfb6e5c769cce2c9f81ca0c)
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/qemu/qemu-1.2.0/linker-flags-2.patch | 26 | ||||
-rw-r--r-- | meta/recipes-devtools/qemu/qemu_1.2.0.bb | 1 |
2 files changed, 27 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu-1.2.0/linker-flags-2.patch b/meta/recipes-devtools/qemu/qemu-1.2.0/linker-flags-2.patch new file mode 100644 index 0000000000..ba50c8d5d2 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu-1.2.0/linker-flags-2.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | diff -urN qemu-1.2.0.orig/Makefile qemu-1.2.0/Makefile | ||
2 | --- qemu-1.2.0.orig/Makefile 2012-09-05 10:03:06.000000000 -0400 | ||
3 | +++ qemu-1.2.0/Makefile 2013-05-07 12:18:23.638560591 -0400 | ||
4 | @@ -172,7 +172,7 @@ | ||
5 | qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx | ||
6 | $(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@," GEN $@") | ||
7 | |||
8 | -qemu-ga$(EXESUF): LIBS = $(LIBS_QGA) | ||
9 | +qemu-ga$(EXESUF): LIBS = $(LIBS_QGA) -lrt | ||
10 | qemu-ga$(EXESUF): QEMU_CFLAGS += -I qga/qapi-generated | ||
11 | |||
12 | gen-out-type = $(subst .,-,$(suffix $@)) | ||
13 | diff -urN qemu-1.2.0.orig/configure qemu-1.2.0/configure | ||
14 | --- qemu-1.2.0.orig/configure 2012-09-05 10:03:06.000000000 -0400 | ||
15 | +++ qemu-1.2.0/configure 2013-05-07 12:11:06.940307455 -0400 | ||
16 | @@ -2681,6 +2681,10 @@ | ||
17 | LIBS="-lrt $LIBS" | ||
18 | fi | ||
19 | |||
20 | +if test "$linux" = "yes" ; then | ||
21 | + LIBS="-lrt $LIBS" | ||
22 | +fi | ||
23 | + | ||
24 | if test "$darwin" != "yes" -a "$mingw32" != "yes" -a "$solaris" != yes -a \ | ||
25 | "$aix" != "yes" -a "$haiku" != "yes" ; then | ||
26 | libs_softmmu="-lutil $libs_softmmu" | ||
diff --git a/meta/recipes-devtools/qemu/qemu_1.2.0.bb b/meta/recipes-devtools/qemu/qemu_1.2.0.bb index 517a74b05e..7a81f0affd 100644 --- a/meta/recipes-devtools/qemu/qemu_1.2.0.bb +++ b/meta/recipes-devtools/qemu/qemu_1.2.0.bb | |||
@@ -8,6 +8,7 @@ SRC_URI = "\ | |||
8 | file://powerpc_rom.bin \ | 8 | file://powerpc_rom.bin \ |
9 | file://no-strip.patch \ | 9 | file://no-strip.patch \ |
10 | file://linker-flags.patch \ | 10 | file://linker-flags.patch \ |
11 | file://linker-flags-2.patch \ | ||
11 | file://qemu-vmware-vga-depth.patch \ | 12 | file://qemu-vmware-vga-depth.patch \ |
12 | file://fix-configure-checks.patch \ | 13 | file://fix-configure-checks.patch \ |
13 | file://fallback-to-safe-mmap_min_addr.patch \ | 14 | file://fallback-to-safe-mmap_min_addr.patch \ |