| Message ID | 20230428084352.836515-8-alex@linutronix.de |
|---|---|
| State | Accepted, archived |
| Commit | c0fb603c9e26e91388320c02842b42cc7b091d6c |
| Headers | show |
| Series | [v2,01/11] binutils: backport a patch to address failures when time64.inc is in use | expand |
diff --git a/meta/lib/oeqa/sdk/cases/assimp.py b/meta/lib/oeqa/sdk/cases/assimp.py index aa6541c6f6d..e4c5c730037 100644 --- a/meta/lib/oeqa/sdk/cases/assimp.py +++ b/meta/lib/oeqa/sdk/cases/assimp.py @@ -22,6 +22,9 @@ class BuildAssimp(OESDKTestCase): if not (self.tc.hasHostPackage("nativesdk-cmake") or self.tc.hasHostPackage("cmake-native")): raise unittest.SkipTest("Needs cmake") + if not (self.tc.hasTargetPackage("zlib", multilib=True) or \ + self.tc.hasTargetPackage("libz1", multilib=True)): + raise unittest.SkipTest("Assimp test needs zlib in the SDK") def test_assimp(self): with tempfile.TemporaryDirectory(prefix="assimp", dir=self.tc.sdk_dir) as testdir:
Otherwise assimp will silently fall back to a vendored copy of zlib which will fail with -D_TIME_BITS=64 due to https://github.com/madler/zlib/pull/764 This was exposed by multilib mips core-image-minimal SDKs, where the default 64 bit sysroot has zlib, but 32 bit sysroot does not. Signed-off-by: Alexander Kanavin <alex@linutronix.de> --- meta/lib/oeqa/sdk/cases/assimp.py | 3 +++ 1 file changed, 3 insertions(+)