Message ID | 20231128000701.3180126-1-raj.khem@gmail.com |
---|---|
State | Accepted, archived |
Commit | d2c4e8cb85c6a5ca37c7990f879c3b650df5770b |
Headers | show |
Series | [v11] vte: Separate out gtk4 pieces of vte into individual packages | expand |
Hello Khem, The vte upgrade causes librsvg to fail on qemux86-64-x32: https://autobuilder.yoctoproject.org/typhoon/#/builders/57/builds/8077/steps/11/logs/stdio I'm not sure how and I was suspecting other rust changes but I confirmed this is the 3 patches series as this one was successful: https://autobuilder.yoctoproject.org/typhoon/#/builders/57/builds/8083 On 27/11/2023 16:07:01-0800, Khem Raj wrote: > This avoids adding gtk4 dependencies when image may only desire the gtk3 > pieces of vte. > > Signed-off-by: Khem Raj <raj.khem@gmail.com> > Cc: Ross Burton <ross.burton@arm.com> > --- > v11: Package Vte-3.91.gir into ${PN}-gtk4-dev > > meta/recipes-support/vte/vte_0.74.1.bb | 11 ++++++++++- > 1 file changed, 10 insertions(+), 1 deletion(-) > > diff --git a/meta/recipes-support/vte/vte_0.74.1.bb b/meta/recipes-support/vte/vte_0.74.1.bb > index 8a7054a13cd..071f6684644 100644 > --- a/meta/recipes-support/vte/vte_0.74.1.bb > +++ b/meta/recipes-support/vte/vte_0.74.1.bb > @@ -36,7 +36,16 @@ PACKAGECONFIG[gtk4] = "-Dgtk4=true,-Dgtk4=false,gtk4" > PACKAGECONFIG[gnutls] = "-Dgnutls=true,-Dgnutls=false,gnutls" > PACKAGECONFIG[systemd] = "-D_systemd=true,-D_systemd=false,systemd" > > -PACKAGES =+ "libvte ${PN}-prompt" > +PACKAGES =+ "libvte-gtk4 ${PN}-gtk4 ${PN}-gtk4-dev libvte ${PN}-prompt" > +FILES:libvte-gtk4 = "${libdir}/lib*gtk4.so.* ${libdir}/girepository-1.0/Vte-3.91.typelib" > +FILES:${PN}-gtk4 ="${bindir}/vte-2.91-gtk4" > +FILES:${PN}-gtk4-dev = "${libdir}/lib*gtk4.so \ > + ${libdir}/pkgconfig/vte-2.91-gtk4.pc \ > + ${datadir}/gir-1.0/Vte-3.91.gir \ > + ${datadir}/vala/vapi/vte-2.91-gtk4.deps \ > + ${datadir}/vala/vapi/vte-2.91-gtk4.vapi \ > + ${includedir}/vte-2.91-gtk4 \ > + " > FILES:${PN} +="${systemd_user_unitdir}" > FILES:libvte = "${libdir}/*.so.* ${libdir}/girepository-1.0/*" > FILES:${PN}-prompt = " \ > -- > 2.43.0 > > > -=-=-=-=-=-=-=-=-=-=-=- > Links: You receive all messages sent to this group. > View/Reply Online (#191330): https://lists.openembedded.org/g/openembedded-core/message/191330 > Mute This Topic: https://lists.openembedded.org/mt/102841833/3617179 > Group Owner: openembedded-core+owner@lists.openembedded.org > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com] > -=-=-=-=-=-=-=-=-=-=-=- >
On Thu, Nov 30, 2023 at 11:48 PM Alexandre Belloni <alexandre.belloni@bootlin.com> wrote: > > Hello Khem, > > The vte upgrade causes librsvg to fail on qemux86-64-x32: > https://autobuilder.yoctoproject.org/typhoon/#/builders/57/builds/8077/steps/11/logs/stdio > I think it could be that os and libc are not computed correctly for rust on x32 Can you try this patch on top of these three. https://snips.sh/f/WuMM_2WYXh > I'm not sure how and I was suspecting other rust changes but I confirmed > this is the 3 patches series as this one was successful: > https://autobuilder.yoctoproject.org/typhoon/#/builders/57/builds/8083 > > > On 27/11/2023 16:07:01-0800, Khem Raj wrote: > > This avoids adding gtk4 dependencies when image may only desire the gtk3 > > pieces of vte. > > > > Signed-off-by: Khem Raj <raj.khem@gmail.com> > > Cc: Ross Burton <ross.burton@arm.com> > > --- > > v11: Package Vte-3.91.gir into ${PN}-gtk4-dev > > > > meta/recipes-support/vte/vte_0.74.1.bb | 11 ++++++++++- > > 1 file changed, 10 insertions(+), 1 deletion(-) > > > > diff --git a/meta/recipes-support/vte/vte_0.74.1.bb b/meta/recipes-support/vte/vte_0.74.1.bb > > index 8a7054a13cd..071f6684644 100644 > > --- a/meta/recipes-support/vte/vte_0.74.1.bb > > +++ b/meta/recipes-support/vte/vte_0.74.1.bb > > @@ -36,7 +36,16 @@ PACKAGECONFIG[gtk4] = "-Dgtk4=true,-Dgtk4=false,gtk4" > > PACKAGECONFIG[gnutls] = "-Dgnutls=true,-Dgnutls=false,gnutls" > > PACKAGECONFIG[systemd] = "-D_systemd=true,-D_systemd=false,systemd" > > > > -PACKAGES =+ "libvte ${PN}-prompt" > > +PACKAGES =+ "libvte-gtk4 ${PN}-gtk4 ${PN}-gtk4-dev libvte ${PN}-prompt" > > +FILES:libvte-gtk4 = "${libdir}/lib*gtk4.so.* ${libdir}/girepository-1.0/Vte-3.91.typelib" > > +FILES:${PN}-gtk4 ="${bindir}/vte-2.91-gtk4" > > +FILES:${PN}-gtk4-dev = "${libdir}/lib*gtk4.so \ > > + ${libdir}/pkgconfig/vte-2.91-gtk4.pc \ > > + ${datadir}/gir-1.0/Vte-3.91.gir \ > > + ${datadir}/vala/vapi/vte-2.91-gtk4.deps \ > > + ${datadir}/vala/vapi/vte-2.91-gtk4.vapi \ > > + ${includedir}/vte-2.91-gtk4 \ > > + " > > FILES:${PN} +="${systemd_user_unitdir}" > > FILES:libvte = "${libdir}/*.so.* ${libdir}/girepository-1.0/*" > > FILES:${PN}-prompt = " \ > > -- > > 2.43.0 > > > > > > > -=-=-=-=-=-=-=-=-=-=-=- > > Links: You receive all messages sent to this group. > > View/Reply Online (#191330): https://lists.openembedded.org/g/openembedded-core/message/191330 > > Mute This Topic: https://lists.openembedded.org/mt/102841833/3617179 > > Group Owner: openembedded-core+owner@lists.openembedded.org > > Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com] > > -=-=-=-=-=-=-=-=-=-=-=- > > > > > -- > Alexandre Belloni, co-owner and COO, Bootlin > Embedded Linux and Kernel engineering > https://bootlin.com
diff --git a/meta/recipes-support/vte/vte_0.74.1.bb b/meta/recipes-support/vte/vte_0.74.1.bb index 8a7054a13cd..071f6684644 100644 --- a/meta/recipes-support/vte/vte_0.74.1.bb +++ b/meta/recipes-support/vte/vte_0.74.1.bb @@ -36,7 +36,16 @@ PACKAGECONFIG[gtk4] = "-Dgtk4=true,-Dgtk4=false,gtk4" PACKAGECONFIG[gnutls] = "-Dgnutls=true,-Dgnutls=false,gnutls" PACKAGECONFIG[systemd] = "-D_systemd=true,-D_systemd=false,systemd" -PACKAGES =+ "libvte ${PN}-prompt" +PACKAGES =+ "libvte-gtk4 ${PN}-gtk4 ${PN}-gtk4-dev libvte ${PN}-prompt" +FILES:libvte-gtk4 = "${libdir}/lib*gtk4.so.* ${libdir}/girepository-1.0/Vte-3.91.typelib" +FILES:${PN}-gtk4 ="${bindir}/vte-2.91-gtk4" +FILES:${PN}-gtk4-dev = "${libdir}/lib*gtk4.so \ + ${libdir}/pkgconfig/vte-2.91-gtk4.pc \ + ${datadir}/gir-1.0/Vte-3.91.gir \ + ${datadir}/vala/vapi/vte-2.91-gtk4.deps \ + ${datadir}/vala/vapi/vte-2.91-gtk4.vapi \ + ${includedir}/vte-2.91-gtk4 \ + " FILES:${PN} +="${systemd_user_unitdir}" FILES:libvte = "${libdir}/*.so.* ${libdir}/girepository-1.0/*" FILES:${PN}-prompt = " \
This avoids adding gtk4 dependencies when image may only desire the gtk3 pieces of vte. Signed-off-by: Khem Raj <raj.khem@gmail.com> Cc: Ross Burton <ross.burton@arm.com> --- v11: Package Vte-3.91.gir into ${PN}-gtk4-dev meta/recipes-support/vte/vte_0.74.1.bb | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)