sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

qemu: Fix linking of the native package on Fedora 13 

Fedora 13 switched the default behaviour of the linker to no longer
indirectly link to required libraries (i.e. dependencies of a library
already linked to). Therefore we need to explicitly pass the depended on
libraries into the linker for building to work on Fedora 13.

Signed-off-by: Joshua Lock <josh@linux.intel.com>
This commit is contained in:
Joshua Lock 2010-06-15 12:22:01 +01:00
parent 5101076eab
commit c87bf0cfc6
4 changed files with 39 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
meta/packages/qemu/qemu-0.12.4/linker-flags.patch vendored Normal file
View File

@ -0,0 +1,22 @@
Fedora 13 switched the default behaviour of the linker to no longer
indirectly link to required libraries (i.e. dependencies of a library
already linked to). Therefore we need to explicitly pass the depended on
libraries into the linker for building to work on Fedora 13.
More information is available on the Fedora Wiki:
https://fedoraproject.org/wiki/UnderstandingDSOLinkChange
JL - 15/06/10
Index: qemu-0.12.4/Makefile.target
===================================================================
--- qemu-0.12.4.orig/Makefile.target 2010-06-15 11:21:52.000000000 +0100
+++ qemu-0.12.4/Makefile.target 2010-06-15 11:25:27.212852910 +0100
@@ -178,7 +178,7 @@
obj-y += virtio-blk.o virtio-balloon.o virtio-net.o virtio-console.o virtio-pci.o
obj-$(CONFIG_KVM) += kvm.o kvm-all.o
obj-$(CONFIG_ISA_MMIO) += isa_mmio.o
-LIBS+=-lz
+LIBS+=-lz -lX11 -ldl
sound-obj-y =
sound-obj-$(CONFIG_SB16) += sb16.o

2
meta/packages/qemu/qemu.inc
View File

@ -3,7 +3,7 @@ HOMEPAGE = "http://qemu.org"
LICENSE = "GPL"
DEPENDS = "zlib"
EXTRA_OECONF = "--target-list=arm-linux-user,arm-softmmu,i386-softmmu,x86_64-softmmu,mips-linux-user,mips-softmmu --disable-werror --disable-vnc-tls --extra-ldflags=-ldl"
EXTRA_OECONF = "--target-list=arm-linux-user,arm-softmmu,i386-softmmu,x86_64-softmmu,mips-linux-user,mips-softmmu --disable-werror --disable-vnc-tls"
#EXTRA_OECONF += "--disable-sdl"
inherit autotools

15
meta/packages/qemu/qemu_0.12.4.bb
View File

@ -1,17 +1,18 @@
require qemu.inc
PR = "r13"
PR = "r14"
FILESPATH = "${FILE_DIRNAME}/qemu-${PV}"
FILESDIR = "${WORKDIR}"
SRC_URI = "\
http://download.savannah.gnu.org/releases/qemu/qemu-${PV}.tar.gz \
file://workaround_bad_futex_headers.patch;patch=1 \
file://qemu-git-qemugl-host.patch;patch=1 \
file://no-strip.patch;patch=1 \
file://fix-dirent.patch;patch=1 \
file://fix-nogl.patch;patch=1 \
file://qemugl-allow-glxcontext-release.patch;patch=1"
file://workaround_bad_futex_headers.patch \
file://qemu-git-qemugl-host.patch \
file://no-strip.patch \
file://fix-dirent.patch \
file://fix-nogl.patch \
file://qemugl-allow-glxcontext-release.patch \
file://linker-flags.patch"
S = "${WORKDIR}/qemu-${PV}"

15
meta/packages/qemu/qemu_git.bb
View File

@ -1,19 +1,20 @@
require qemu.inc
PV = "0.12.4"
PR = "r7"
PR = "r8"
FILESPATH = "${FILE_DIRNAME}/qemu-${PV}/:${FILE_DIRNAME}/qemu-git/"
FILESDIR = "${WORKDIR}"
SRC_URI = "\
git://git.sv.gnu.org/qemu.git;protocol=git \
file://workaround_bad_futex_headers.patch;patch=1 \
file://qemu-git-qemugl-host.patch;patch=1 \
file://no-strip.patch;patch=1 \
file://fix-dirent.patch;patch=1 \
file://fix-nogl.patch;patch=1 \
file://qemugl-allow-glxcontext-release.patch;patch=1"
file://workaround_bad_futex_headers.patch \
file://qemu-git-qemugl-host.patch \
file://no-strip.patch \
file://fix-dirent.patch \
file://fix-nogl.patch \
file://qemugl-allow-glxcontext-release.patch \
file://linker-flags.patch"
S = "${WORKDIR}/git"