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:26 +0100 |
commit | 850b5d5eed9969a888e4f224dc39d5f551e1403d (patch) | |
tree | 86cc54888a12974940e5f158e02b6027a4c9d749 /meta/lib | |
parent | 1d82fbc95ac86fc7a429835b5faa08ab98c8fb3d (diff) | |
download | poky-850b5d5eed9969a888e4f224dc39d5f551e1403d.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.
(From OE-Core rev: c0fb603c9e26e91388320c02842b42cc7b091d6c)
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')
-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): | |||
22 | if not (self.tc.hasHostPackage("nativesdk-cmake") or | 22 | if not (self.tc.hasHostPackage("nativesdk-cmake") or |
23 | self.tc.hasHostPackage("cmake-native")): | 23 | self.tc.hasHostPackage("cmake-native")): |
24 | raise unittest.SkipTest("Needs cmake") | 24 | raise unittest.SkipTest("Needs cmake") |
25 | if not (self.tc.hasTargetPackage("zlib", multilib=True) or \ | ||
26 | self.tc.hasTargetPackage("libz1", multilib=True)): | ||
27 | raise unittest.SkipTest("Assimp test needs zlib in the SDK") | ||
25 | 28 | ||
26 | def test_assimp(self): | 29 | def test_assimp(self): |
27 | with tempfile.TemporaryDirectory(prefix="assimp", dir=self.tc.sdk_dir) as testdir: | 30 | with tempfile.TemporaryDirectory(prefix="assimp", dir=self.tc.sdk_dir) as testdir: |