aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCristian Iorga <cristian.iorga@intel.com>2014-08-18 12:44:00 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-18 20:43:24 +0100
commit47d1fc9f5c38f3d092937c47bd4c2f45adaa7fe6 (patch)
tree18c4754f6d6c18c3eec37f0bd8a1e81b1715603f
parenta0f584ac3d5a94dec121b684206ecd40c968f7fc (diff)
downloadopenembedded-core-contrib-47d1fc9f5c38f3d092937c47bd4c2f45adaa7fe6.tar.gz
openembedded-core-contrib-47d1fc9f5c38f3d092937c47bd4c2f45adaa7fe6.tar.bz2
openembedded-core-contrib-47d1fc9f5c38f3d092937c47bd4c2f45adaa7fe6.zip
qemu: fix Darwin cross-compilation
Darwin target will not be detected correctly if qemu is cross-compiled under a Linux host. Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/qemu/qemu/configure-fix-Darwin-target-detection.patch32
-rw-r--r--meta/recipes-devtools/qemu/qemu_2.1.0.bb4
2 files changed, 34 insertions, 2 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/configure-fix-Darwin-target-detection.patch b/meta/recipes-devtools/qemu/qemu/configure-fix-Darwin-target-detection.patch
new file mode 100644
index 00000000000..59cdc1c3048
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/configure-fix-Darwin-target-detection.patch
@@ -0,0 +1,32 @@
+Upstream-Status: Pending
+Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
+
+From 9ac096d8eccf2d56ece646320c282c8369f8337c Mon Sep 17 00:00:00 2001
+From: Cristian Iorga <cristian.iorga@intel.com>
+Date: Tue, 29 Jul 2014 18:35:59 +0300
+Subject: [PATCH] configure: fix Darwin target detection
+
+fix Darwin target detection for qemu
+cross-compilation.
+
+Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
+---
+ configure | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/configure b/configure
+index 283c71c..1c66a11 100755
+--- a/configure
++++ b/configure
+@@ -444,6 +444,8 @@ elif check_define __sun__ ; then
+ targetos='SunOS'
+ elif check_define __HAIKU__ ; then
+ targetos='Haiku'
++elif check_define __APPLE__ ; then
++ targetos='Darwin'
+ else
+ targetos=`uname -s`
+ fi
+--
+1.9.1
+
diff --git a/meta/recipes-devtools/qemu/qemu_2.1.0.bb b/meta/recipes-devtools/qemu/qemu_2.1.0.bb
index abf8dfcf1c5..9b8337a73d5 100644
--- a/meta/recipes-devtools/qemu/qemu_2.1.0.bb
+++ b/meta/recipes-devtools/qemu/qemu_2.1.0.bb
@@ -3,10 +3,10 @@ require qemu.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913"
-SRC_URI += "file://qemu-enlarge-env-entry-size.patch \
+SRC_URI += "file://configure-fix-Darwin-target-detection.patch \
+ file://qemu-enlarge-env-entry-size.patch \
file://Qemu-Arm-versatilepb-Add-memory-size-checking.patch \
"
-
SRC_URI_prepend = "http://wiki.qemu-project.org/download/${BP}.tar.bz2"
SRC_URI[md5sum] = "6726977292b448cbc7f89998fac6983b"
SRC_URI[sha256sum] = "397e23184f4bf613589a8fe0c6542461dc2afdf17ed337e97e6fd2f31e8f8802"