[oe-commits] Trevor Woerner : qemu-native: fix DSO linking

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: danny
Commit: c0ed6d8017eb83321dfb6e5c769cce2c9f81ca0c
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=c0ed6d8017eb83321dfb6e5c769cce2c9f81ca0c

Author: Trevor Woerner <twoerner at gmail.com>
Date:   Tue May  7 13:37:14 2013 -0400

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]
Signed-off-by: Trevor Woerner <twoerner at gmail.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 .../qemu/qemu-1.2.0/linker-flags-2.patch           |   26 ++++++++++++++++++++
 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 0000000..ba50c8d
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu-1.2.0/linker-flags-2.patch
@@ -0,0 +1,26 @@
+diff -urN qemu-1.2.0.orig/Makefile qemu-1.2.0/Makefile
+--- qemu-1.2.0.orig/Makefile	2012-09-05 10:03:06.000000000 -0400
++++ qemu-1.2.0/Makefile	2013-05-07 12:18:23.638560591 -0400
+@@ -172,7 +172,7 @@
+ qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx
+ 	$(call quiet-command,sh $(SRC_PATH)/scripts/hxtool -h < $< > $@,"  GEN   $@")
+ 
+-qemu-ga$(EXESUF): LIBS = $(LIBS_QGA)
++qemu-ga$(EXESUF): LIBS = $(LIBS_QGA) -lrt
+ qemu-ga$(EXESUF): QEMU_CFLAGS += -I qga/qapi-generated
+ 
+ gen-out-type = $(subst .,-,$(suffix $@))
+diff -urN qemu-1.2.0.orig/configure qemu-1.2.0/configure
+--- qemu-1.2.0.orig/configure	2012-09-05 10:03:06.000000000 -0400
++++ qemu-1.2.0/configure	2013-05-07 12:11:06.940307455 -0400
+@@ -2681,6 +2681,10 @@
+   LIBS="-lrt $LIBS"
+ fi
+ 
++if test "$linux" = "yes" ; then
++  LIBS="-lrt $LIBS"
++fi
++
+ if test "$darwin" != "yes" -a "$mingw32" != "yes" -a "$solaris" != yes -a \
+         "$aix" != "yes" -a "$haiku" != "yes" ; then
+     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 517a74b..7a81f0a 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 = "\
     file://powerpc_rom.bin \
     file://no-strip.patch \
     file://linker-flags.patch \
+    file://linker-flags-2.patch \
     file://qemu-vmware-vga-depth.patch \
     file://fix-configure-checks.patch \
     file://fallback-to-safe-mmap_min_addr.patch \