summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-01-07 20:58:07 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-01-09 09:09:50 +0000
commitd09b0030521410cbc0d36f18b5ca8b36b2c9ec19 (patch)
tree1f1c81bbfcb57aee33598a7dcd0110831c56db35
parent7cb670c4a9af7126a58fae7a71aad9526531b02c (diff)
downloadpoky-d09b0030521410cbc0d36f18b5ca8b36b2c9ec19.tar.gz
qemu: Fix mingw builds
After the recent upgrade, mingw builds failed. Add a hack whilst a solution is discussed upstream. (From OE-Core rev: 967c6767eacab1951ae710666c588551102be5a3) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/qemu/qemu.inc1
-rw-r--r--meta/recipes-devtools/qemu/qemu/mingwfix.patch21
2 files changed, 22 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index 4c1502da7f..286901fb1f 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -26,6 +26,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \
26 file://0010-configure-Add-pkg-config-handling-for-libgcrypt.patch \ 26 file://0010-configure-Add-pkg-config-handling-for-libgcrypt.patch \
27 file://0001-Add-enable-disable-udev.patch \ 27 file://0001-Add-enable-disable-udev.patch \
28 file://0001-qemu-Do-not-include-file-if-not-exists.patch \ 28 file://0001-qemu-Do-not-include-file-if-not-exists.patch \
29 file://mingwfix.patch \
29 " 30 "
30UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" 31UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar"
31 32
diff --git a/meta/recipes-devtools/qemu/qemu/mingwfix.patch b/meta/recipes-devtools/qemu/qemu/mingwfix.patch
new file mode 100644
index 0000000000..8d76cef638
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu/mingwfix.patch
@@ -0,0 +1,21 @@
1OE assumes that mingw files are in a unix like file layout. The
2'flattening' done by configure in qemu for mingw32 breaks things
3for us. We are discussing with upstream but for now, hack this to
4disable it and use the unix like layout everywhere.
5
6Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
7Upstream-Status: Submitted [https://lists.gnu.org/archive/html/qemu-devel/2021-01/msg01073.html]
8
9Index: qemu-5.2.0/configure
10===================================================================
11--- qemu-5.2.0.orig/configure
12+++ qemu-5.2.0/configure
13@@ -1541,7 +1541,7 @@ libdir="${libdir:-$prefix/lib}"
14 libexecdir="${libexecdir:-$prefix/libexec}"
15 includedir="${includedir:-$prefix/include}"
16
17-if test "$mingw32" = "yes" ; then
18+if test "$mingw32" = "dontwantthis" ; then
19 mandir="$prefix"
20 datadir="$prefix"
21 docdir="$prefix"