diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-12-07 21:15:33 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-12-23 23:05:57 +0000 |
| commit | d268f6c998d433dbdadb0b15d7682640f5687a04 (patch) | |
| tree | cf307238dc9bba3f246f269a99fb0436e2b0f78a | |
| parent | 30715ff8c2bbe2f37109a9d0e061b616f68a8da2 (diff) | |
| download | poky-d268f6c998d433dbdadb0b15d7682640f5687a04.tar.gz | |
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).
(From OE-Core rev: 6e28ce40fcec1beed2b6662fd131fe66118b7b98)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 34afdd0bf5e2810d440bcd378ba1023159c2b2d0)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/qemu/qemu.inc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 55aced9f9a..0b24540bf9 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+" | |||
| 148 | PACKAGECONFIG:remove:mingw32 = "kvm virglrenderer epoxy gtk+" | 148 | PACKAGECONFIG:remove:mingw32 = "kvm virglrenderer epoxy gtk+" |
| 149 | 149 | ||
| 150 | PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,libsdl2" | 150 | PACKAGECONFIG[sdl] = "--enable-sdl,--disable-sdl,libsdl2" |
| 151 | PACKAGECONFIG[png] = "--enable-png,--disable-png,libpng" | ||
| 151 | PACKAGECONFIG[virtfs] = "--enable-virtfs --enable-attr --enable-cap-ng,--disable-virtfs,libcap-ng attr," | 152 | PACKAGECONFIG[virtfs] = "--enable-virtfs --enable-attr --enable-cap-ng,--disable-virtfs,libcap-ng attr," |
| 152 | PACKAGECONFIG[aio] = "--enable-linux-aio,--disable-linux-aio,libaio," | 153 | PACKAGECONFIG[aio] = "--enable-linux-aio,--disable-linux-aio,libaio," |
| 153 | PACKAGECONFIG[uring] = "--enable-linux-io-uring,--disable-linux-io-uring,liburing" | 154 | PACKAGECONFIG[uring] = "--enable-linux-io-uring,--disable-linux-io-uring,liburing" |