From: Dmitry Baryshkov Date: Mon, 24 Jul 2023 13:32:00 +0000 (+0300) Subject: mesa: simplify overriding GALLIUMDRIVERS_LLVM X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~275 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fac5aa9503c2c6579b0389f8c304b9a914b940c8;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git mesa: simplify overriding GALLIUMDRIVERS_LLVM Embedded devices might want to extend and/or override the GALLIUMDRIVERS_LLVM variable (to change the set of gallium drivers enabled for the particular device). Simplify this task by making the GALLIUMDRIVERS_LLVM variable follow the rest of mesa.inc variables and contain the leading comma. Signed-off-by: Dmitry Baryshkov Signed-off-by: Alexandre Belloni --- diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 928899008e6..ade097d7cc5 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -163,7 +163,7 @@ GALLIUMDRIVERS:append ="${@bb.utils.contains('PACKAGECONFIG', 'zink', ',zink', ' # radeonsi requires LLVM GALLIUMDRIVERS_RADEONSI = "${@bb.utils.contains('PACKAGECONFIG', 'r600', ',radeonsi', '', d)}" -GALLIUMDRIVERS_LLVM = "r300,nouveau${GALLIUMDRIVERS_RADEONSI}" +GALLIUMDRIVERS_LLVM = ",r300,nouveau${GALLIUMDRIVERS_RADEONSI}" GALLIUMDRIVERS_LLVM:append:x86 = ",svga" GALLIUMDRIVERS_LLVM:append:x86-64 = ",svga" # i686 is a 32 bit override for mesa-native @@ -172,7 +172,7 @@ GALLIUMDRIVERS_LLVM:append:i686 = ",svga" PACKAGECONFIG[r600] = "" PACKAGECONFIG[virgl] = "" -GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}" +GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', '${GALLIUMDRIVERS_LLVM}', '', d)}" GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'r600', ',r600', '', d)}" GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'virgl', ',virgl', '', d)}"