diff options
-rw-r--r-- | meta/recipes-devtools/qemu/qemu.inc | 1 | ||||
-rw-r--r-- | meta/recipes-devtools/qemu/qemu/mingwfix.patch | 21 |
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 | " |
30 | UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" | 31 | UPSTREAM_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 @@ | |||
1 | OE assumes that mingw files are in a unix like file layout. The | ||
2 | 'flattening' done by configure in qemu for mingw32 breaks things | ||
3 | for us. We are discussing with upstream but for now, hack this to | ||
4 | disable it and use the unix like layout everywhere. | ||
5 | |||
6 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
7 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/qemu-devel/2021-01/msg01073.html] | ||
8 | |||
9 | Index: 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" | ||