From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Wed, 7 Dec 2022 21:15:33 +0000 (+0000)
Subject: qemu: Ensure libpng dependency is deterministic
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~2348
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=34afdd0bf5e2810d440bcd378ba1023159c2b2d0;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

qemu: Ensure libpng dependency is deterministic

If the host has libpng, because of the way we handle the GL dependency in qemu,
it can cause determinism issues. Add a specific PACKAGECONFIG entry for libpng
to avoid this (and the associated autobuilder/uninative glibc symbol mismatch
failures).

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index 55aced9f9a8..0b24540bf92 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -148,6 +148,7 @@ PACKAGECONFIG:remove:darwin = "kvm virglrenderer epoxy gtk+"
 PACKAGECONFIG:remove:mingw32 = "kvm virglrenderer epoxy gtk+"
 
 PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,libsdl2"
+PACKAGECONFIG[png] = "--enable-png,--disable-png,libpng"
 PACKAGECONFIG[virtfs] = "--enable-virtfs --enable-attr --enable-cap-ng,--disable-virtfs,libcap-ng attr,"
 PACKAGECONFIG[aio] = "--enable-linux-aio,--disable-linux-aio,libaio,"
 PACKAGECONFIG[uring] = "--enable-linux-io-uring,--disable-linux-io-uring,liburing"