After the recent upgrade, mingw builds failed. Add a hack whilst a solution is discussed upstream.
Signed-off-by: Richard Purdie <richard.pur...@linuxfoundation.org> --- meta/recipes-devtools/qemu/qemu.inc | 1 + .../recipes-devtools/qemu/qemu/mingwfix.patch | 21 +++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 meta/recipes-devtools/qemu/qemu/mingwfix.patch diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 4c1502da7f1..286901fb1f0 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 \ file://0010-configure-Add-pkg-config-handling-for-libgcrypt.patch \ file://0001-Add-enable-disable-udev.patch \ file://0001-qemu-Do-not-include-file-if-not-exists.patch \ + file://mingwfix.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P<pver>\d+(\.\d+)+)\.tar" diff --git a/meta/recipes-devtools/qemu/qemu/mingwfix.patch b/meta/recipes-devtools/qemu/qemu/mingwfix.patch new file mode 100644 index 00000000000..8d76cef6388 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/mingwfix.patch @@ -0,0 +1,21 @@ +OE assumes that mingw files are in a unix like file layout. The +'flattening' done by configure in qemu for mingw32 breaks things +for us. We are discussing with upstream but for now, hack this to +disable it and use the unix like layout everywhere. + +Signed-off-by: Richard Purdie <richard.pur...@linuxfoundation.org> +Upstream-Status: Submitted [https://lists.gnu.org/archive/html/qemu-devel/2021-01/msg01073.html] + +Index: qemu-5.2.0/configure +=================================================================== +--- qemu-5.2.0.orig/configure ++++ qemu-5.2.0/configure +@@ -1541,7 +1541,7 @@ libdir="${libdir:-$prefix/lib}" + libexecdir="${libexecdir:-$prefix/libexec}" + includedir="${includedir:-$prefix/include}" + +-if test "$mingw32" = "yes" ; then ++if test "$mingw32" = "dontwantthis" ; then + mandir="$prefix" + datadir="$prefix" + docdir="$prefix" -- 2.27.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#146486): https://lists.openembedded.org/g/openembedded-core/message/146486 Mute This Topic: https://lists.openembedded.org/mt/79510442/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
