summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-09-17 11:55:44 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-09-17 22:25:25 +0100
commit43a6e6657f4141696fb27a8797b07dda722fc763 (patch)
tree9f23700f392fc7a01207649c5f4f9751477b03cb /meta
parentb4def683898ecfa0330a45576c378be4fb007a5f (diff)
downloadpoky-43a6e6657f4141696fb27a8797b07dda722fc763.tar.gz
qemu-nativesdk: Add patch to fix linkage
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/qemu/qemu-git/glflags.patch13
-rw-r--r--meta/packages/qemu/qemu-nativesdk_git.bb4
2 files changed, 16 insertions, 1 deletions
diff --git a/meta/packages/qemu/qemu-git/glflags.patch b/meta/packages/qemu/qemu-git/glflags.patch
new file mode 100644
index 0000000000..fadca25a20
--- /dev/null
+++ b/meta/packages/qemu/qemu-git/glflags.patch
@@ -0,0 +1,13 @@
1Index: git/Makefile.target
2===================================================================
3--- git.orig/Makefile.target 2009-09-17 11:36:06.000000000 +0100
4+++ git/Makefile.target 2009-09-17 11:36:12.000000000 +0100
5@@ -748,7 +748,7 @@
6 $(QEMU_PROG): LIBS += $(SDL_LIBS) $(COCOA_LIBS) $(CURSES_LIBS) $(BRLAPI_LIBS) $(VDE_LIBS)
7
8 $(QEMU_PROG): $(OBJS) ../libqemu_common.a libqemu.a
9- $(LINK) -lGL -lGLU
10+ $(LINK) -lGL
11
12 endif # !CONFIG_USER_ONLY
13
diff --git a/meta/packages/qemu/qemu-nativesdk_git.bb b/meta/packages/qemu/qemu-nativesdk_git.bb
index 30f59d8b4d..9753d1522f 100644
--- a/meta/packages/qemu/qemu-nativesdk_git.bb
+++ b/meta/packages/qemu/qemu-nativesdk_git.bb
@@ -1,6 +1,8 @@
1require qemu_git.bb 1require qemu_git.bb
2require qemu-nativesdk.inc 2require qemu-nativesdk.inc
3 3
4PR = "r2" 4SRC_URI += "file://glflags.patch;patch=1"
5
6PR = "r3"
5 7
6EXTRA_OECONF +="--target-list=arm-linux-user,arm-softmmu,i386-softmmu --disable-vnc-tls --cc=${HOST_PREFIX}gcc" 8EXTRA_OECONF +="--target-list=arm-linux-user,arm-softmmu,i386-softmmu --disable-vnc-tls --cc=${HOST_PREFIX}gcc"