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
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#193084): https://lists.openembedded.org/g/openembedded-core/message/193084 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]] -=-=-=-=-=-=-=-=-=-=-=-
