diff options
author | Khem Raj <raj.khem@gmail.com> | 2012-09-06 15:22:55 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-10 13:01:55 +0100 |
commit | 11432c69fa396eaad3eb5bd1644e9c86b80b5e55 (patch) | |
tree | 23ff736edd81ad50969cb9a68e6c95af8c182b17 /meta/recipes-devtools/qemu/qemu-1.2.0/linker-flags.patch | |
parent | f6cc0772504f3af0869f31abb0da0e5686c61aa8 (diff) | |
download | poky-11432c69fa396eaad3eb5bd1644e9c86b80b5e55.tar.gz |
qemu: Update from 0.15 to 1.2
Forward port the patches which were not applied upstream
(From OE-Core rev: 0c1328a27881f1b3046ed527447608a9fa91b1ea)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu-1.2.0/linker-flags.patch')
-rw-r--r-- | meta/recipes-devtools/qemu/qemu-1.2.0/linker-flags.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu-1.2.0/linker-flags.patch b/meta/recipes-devtools/qemu/qemu-1.2.0/linker-flags.patch new file mode 100644 index 0000000000..0106ae2420 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu-1.2.0/linker-flags.patch | |||
@@ -0,0 +1,25 @@ | |||
1 | Fedora 13 switched the default behaviour of the linker to no longer | ||
2 | indirectly link to required libraries (i.e. dependencies of a library | ||
3 | already linked to). Therefore we need to explicitly pass the depended on | ||
4 | libraries into the linker for building to work on Fedora 13. | ||
5 | |||
6 | More information is available on the Fedora Wiki: | ||
7 | https://fedoraproject.org/wiki/UnderstandingDSOLinkChange | ||
8 | |||
9 | JL - 15/06/10 | ||
10 | |||
11 | Upstream-Status: Inappropriate [configuration] | ||
12 | |||
13 | Index: qemu-1.2.0/Makefile.target | ||
14 | =================================================================== | ||
15 | --- qemu-1.2.0.orig/Makefile.target 2012-09-05 07:03:06.000000000 -0700 | ||
16 | +++ qemu-1.2.0/Makefile.target 2012-09-06 13:42:24.819764288 -0700 | ||
17 | @@ -130,7 +130,7 @@ | ||
18 | obj-$(CONFIG_HAVE_CORE_DUMP) += dump.o | ||
19 | obj-$(CONFIG_NO_GET_MEMORY_MAPPING) += memory_mapping-stub.o | ||
20 | obj-$(CONFIG_NO_CORE_DUMP) += dump-stub.o | ||
21 | -LIBS+=-lz | ||
22 | +LIBS+=-lz -lX11 -ldl | ||
23 | |||
24 | QEMU_CFLAGS += $(VNC_TLS_CFLAGS) | ||
25 | QEMU_CFLAGS += $(VNC_SASL_CFLAGS) | ||