diff mbox series

[meta-mingw] Switch to HOSTTOOLS_NONFATAL

Message ID 20220811164651.836700-1-JPEWhacker@gmail.com
State New
Headers show
Series [meta-mingw] Switch to HOSTTOOLS_NONFATAL | expand

Commit Message

Joshua Watt Aug. 11, 2022, 4:46 p.m. UTC
The changes to split classes into global vs. image specific contexts
has broken the inclusion of `wine` and `wineserver` host tools for
testing MinGW SDKs. This is because testsdk is an image specific class
and therefore it's inclusion is not detected globally and the wine host
tools are not present so the SDK tests fail.

Resolve this by using HOSTTOOLS_NONFATAL which will include the tools if
they exist, but won't fail if they are not present. This does mean that
users will now not know they need wine "up front" when doing a build,
but it will instead fail later when they actually try to test the SDK,
but there isn't really a better way to fix this.

Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
 conf/machine-sdk/include/mingw32-common.inc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
diff mbox series


diff --git a/conf/machine-sdk/include/mingw32-common.inc b/conf/machine-sdk/include/mingw32-common.inc
index 966c63b..07b5b8f 100644
--- a/conf/machine-sdk/include/mingw32-common.inc
+++ b/conf/machine-sdk/include/mingw32-common.inc
@@ -50,5 +50,4 @@  DISABLE_STATIC:mingw32 = ""
 GCCPIE:mingw32 = ""
 # wine and wineserver are required to test MinGW SDKs
-HOSTTOOLS += "${@'wine wineserver' if (bb.utils.contains_any('IMAGE_CLASSES', 'testsdk', True, False, d) or any(x in (d.getVar("BBINCLUDED") or "") for x in ["testsdk.bbclass"])) else ''}"
+HOSTTOOLS_NONFATAL += "wine wineserver"