diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2023-04-28 10:43:49 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-05-05 11:07:21 +0100 |
| commit | c0fb603c9e26e91388320c02842b42cc7b091d6c (patch) | |
| tree | a28b168821023ec43b42494ab81c748e8529e0ac /meta/lib/oeqa/sdk | |
| parent | 333836663ab7bb7994ef23ac8698f8fe2cb95580 (diff) | |
| download | openembedded-core-c0fb603c9e26e91388320c02842b42cc7b091d6c.tar.gz | |
oeqa/sdk/assimp: run only when zlib is in the SDK
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>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oeqa/sdk')
| -rw-r--r-- | meta/lib/oeqa/sdk/cases/assimp.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/lib/oeqa/sdk/cases/assimp.py b/meta/lib/oeqa/sdk/cases/assimp.py index aa6541c6f6..e4c5c73003 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: |