On 30/12/2023 22:02, Richard Purdie wrote:
On Sat, 2023-12-30 at 21:14 +0200, Dmitry Baryshkov wrote:
From: Zoltán Böszörményi<[email protected]>
Mesa now has two OpenCL implementations: Clover (older one) and RustiCL
(newer one). Extend the "opencl" package config to include both
implementations into the libopencl-mesa (-dev) packages. As the Clover
implementation is in maintenance mode and is expected to be removed at
some point, it doesn't make sense to split the packages or to provide
two config options.
Signed-off-by: Zoltán Böszörményi<[email protected]>
[DB: reworked rust class inheritance]
[DB: merged "rusticl" and "clover" back to "opencl"]
Signed-off-by: Dmitry Baryshkov<[email protected]>
---
meta/recipes-graphics/mesa/mesa.inc | 21 ++++++++++++++++-----
1 file changed, 16 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-graphics/mesa/mesa.inc
b/meta/recipes-graphics/mesa/mesa.inc
index efbce5caade5..a192562a7935 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -48,6 +48,12 @@ PROVIDES = " \
inherit meson pkgconfig python3native gettext features_check
+# We can not include rust conditionally, otherwise it can not be overriden by
+# the bbappends. Instead always include it, but remove the dependencies by
+# default.
+inherit rust
+INHIBIT_DEFAULT_RUST_DEPS ="${@bb.utils.contains('PACKAGECONFIG', 'opencl', '',
'1', d)}"
+
I'd really prefer not to have the rust inherit unconditionally. I have
some ideas about how we could fix this in bitbake so we may need to
wait for that if we can't avoid the PACKAGECONFIG issue from appends...
Cheers,
Richard
Richard, All,
Thanks for your work.
I tried to build rusticl with inherit_defer[1][2]. Inherit_defer worked
well but I got an error message:
ERROR: mesa-native-2_23.3.2-r0 do_prepare_recipe_sysroot: The file
/usr/bin/llvm-tblgen17.0.6 is installed by both llvm-native and
clang-native, aborting
It seems that llvm-native and clang-native are in conflict. llvm-native
is a dependency of mesa-native. clang-native is inherited from the
rust-llvm recipe (this inheritance is added by rust-llvm_%.bbappend in
meta-clang).
Here is my configuration:
Build Configuration:
BB_VERSION = "2.7.1"
BUILD_SYS = "x86_64-linux"
NATIVELSBSTRING = "universal"
TARGET_SYS = "x86_64-poky-linux"
MACHINE = "qemux86-64"
DISTRO = "poky"
DISTRO_VERSION = "4.3+snapshot-5ed5d717f122078dd908cce86a0c625c2c64f32a"
TUNE_FEATURES = "m64 core2"
TARGET_FPU = ""
meta
meta-poky
meta-yocto-bsp = "master:5ed5d717f122078dd908cce86a0c625c2c64f32a"
meta-clang = "master:beffde692f3d365678f5fdf60b473b93045d4161"
I also tried the build on the Nanbield version and I got the same message.
[1] :
https://git.yoctoproject.org/poky/commit/?h=master-next&id=859832795040ad04d6136732e4275da443409110
<https://git.yoctoproject.org/poky/commit/?h=master-next&id=859832795040ad04d6136732e4275da443409110>
[2] :
https://git.yoctoproject.org/poky/commit/?h=master-next&id=7ef978a7e66d5ebd2986b890488eeb52d4e2af2e
<https://git.yoctoproject.org/poky/commit/?h=master-next&id=7ef978a7e66d5ebd2986b890488eeb52d4e2af2e>
---
Regards,
Antoine Coutant
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#194242):
https://lists.openembedded.org/g/openembedded-core/message/194242
Mute This Topic: https://lists.openembedded.org/mt/103436170/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
