* [oe-core][PATCHv7] vte: upgrade 2.72.2 -> 2.74.0
@ 2023-09-22 10:39 Markus Volk
2023-09-25 22:03 ` Alexandre Belloni
0 siblings, 1 reply; 4+ messages in thread
From: Markus Volk @ 2023-09-22 10:39 UTC (permalink / raw)
To: openembedded-core
Rework recipe
- remove legacy of the autotools buildsystem
- remove BBCLASSEXTEND
- build vapi dependent on gi-data
- docs require gir, add a EXTRA_OEMESON:append to avoid fail in
a combination where docs=true and gir=false
- gtk+3 and gtk4 are requested by default-> add gtk4 depending
on DISTRO_FEATURE
- install systemd support files depending on DISTRO_FEATURE
- update 0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch
Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
...EXITCODE-macro-for-non-glibc-systems.patch | 35 ++++++++-----------
.../vte/{vte_0.72.2.bb => vte_0.74.0.bb} | 29 ++++++---------
2 files changed, 25 insertions(+), 39 deletions(-)
rename meta/recipes-support/vte/{vte_0.72.2.bb => vte_0.74.0.bb} (67%)
diff --git a/meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch b/meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch
index b4100fc381..8934d5f80a 100644
--- a/meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch
+++ b/meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch
@@ -11,32 +11,25 @@ Upstream-Status: Submitted [1]
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
[1] https://gitlab.gnome.org/GNOME/vte/issues/72
-
---
- src/missing.hh | 4 ++++
- src/widget.cc | 1 +
- 2 files changed, 5 insertions(+)
+ src/widget.cc | 4 +++
+ 1 files changed, 4 insertions(+)
---- a/src/missing.hh
-+++ b/src/missing.hh
-@@ -24,6 +24,10 @@
- #define NSIG (8 * sizeof(sigset_t))
- #endif
+diff --git a/src/widget.cc b/src/widget.cc
+index 07f7cabf..31a77f68 100644
+--- a/src/widget.cc
++++ b/src/widget.cc
+@@ -16,6 +16,10 @@
+ * along with this library. If not, see <https://www.gnu.org/licenses/>.
+ */
+#ifndef W_EXITCODE
+#define W_EXITCODE(ret, sig) ((ret) << 8 | (sig))
+#endif
+
- #ifndef HAVE_FDWALK
- int fdwalk(int (*cb)(void* data, int fd),
- void* data);
---- a/src/widget.cc
-+++ b/src/widget.cc
-@@ -21,6 +21,7 @@
- #include "widget.hh"
-
- #include <sys/wait.h> // for W_EXITCODE
-+#include "missing.hh" // for W_EXITCODE on non-glibc systems
+ #include "config.h"
- #include <exception>
- #include <new>
+ #include "widget.hh"
+--
+2.42.0
+
diff --git a/meta/recipes-support/vte/vte_0.72.2.bb b/meta/recipes-support/vte/vte_0.74.0.bb
similarity index 67%
rename from meta/recipes-support/vte/vte_0.72.2.bb
rename to meta/recipes-support/vte/vte_0.74.0.bb
index 4249b75ac0..aeaf088598 100644
--- a/meta/recipes-support/vte/vte_0.72.2.bb
+++ b/meta/recipes-support/vte/vte_0.74.0.bb
@@ -17,32 +17,27 @@ GNOMEBASEBUILDCLASS = "meson"
GIR_MESON_OPTION = 'gir'
GIDOCGEN_MESON_OPTION = "docs"
-inherit gnomebase gi-docgen features_check upstream-version-is-even gobject-introspection
+inherit gnomebase gi-docgen features_check upstream-version-is-even gobject-introspection vala
-# vapigen.m4 is required when vala is not present (but the one from vala should be used normally)
SRC_URI += "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch"
-SRC_URI[archive.sha256sum] = "f7966fd185a6981f53964162b71cfef7e606495155d6f5827b72aa0dd6741c9e"
+SRC_URI[archive.sha256sum] = "9ae08f777952ba793221152d360550451580f42d3b570e3341ebb6841984c76b"
ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
-# Help g-ir-scanner find the .so for linking
-do_compile:prepend() {
- export GIR_EXTRA_LIBS_PATH="${B}/src/.libs"
-}
+EXTRA_OEMESON += "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-Dvapi=true', '-Dvapi=false', d)}"
+EXTRA_OEMESON:append = " ${@bb.utils.contains('GI_DATA_ENABLED', 'False', '-Ddocs=false', '', d)}"
-# Package additional files
-FILES:${PN}-dev += "${datadir}/vala/vapi/*"
-
-PACKAGECONFIG ??= "gnutls"
-PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false,vala-native vala"
+PACKAGECONFIG ??= " \
+ gnutls \
+ ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gtk4', '', d)} \
+"
+PACKAGECONFIG[gtk4] = "-Dgtk4=true,-Dgtk4=false,gtk4"
PACKAGECONFIG[gnutls] = "-Dgnutls=true,-Dgnutls=false,gnutls"
PACKAGECONFIG[systemd] = "-D_systemd=true,-D_systemd=false,systemd"
-# vala requires gir
-PACKAGECONFIG:remove:class-native = "vala"
-
-CFLAGS += "-D_GNU_SOURCE"
PACKAGES =+ "libvte ${PN}-prompt"
+FILES:${PN} +="${systemd_user_unitdir}"
FILES:libvte = "${libdir}/*.so.* ${libdir}/girepository-1.0/*"
FILES:${PN}-prompt = " \
${sysconfdir}/profile.d \
@@ -50,5 +45,3 @@ FILES:${PN}-prompt = " \
"
FILES:${PN}-dev += "${datadir}/glade/"
-
-BBCLASSEXTEND = "native nativesdk"
--
2.42.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [oe-core][PATCHv7] vte: upgrade 2.72.2 -> 2.74.0
2023-09-22 10:39 [oe-core][PATCHv7] vte: upgrade 2.72.2 -> 2.74.0 Markus Volk
@ 2023-09-25 22:03 ` Alexandre Belloni
2023-09-26 6:38 ` Alexander Kanavin
[not found] ` <17885F8DB02ED3EE.16687@lists.openembedded.org>
0 siblings, 2 replies; 4+ messages in thread
From: Alexandre Belloni @ 2023-09-25 22:03 UTC (permalink / raw)
To: Markus Volk; +Cc: openembedded-core
Hello,
It was not clear to me but I'm fairly sure this is what causes this
failure:
https://autobuilder.yoctoproject.org/typhoon/#/builders/57/builds/7719/steps/12/logs/stdio
On 22/09/2023 12:39:51+0200, Markus Volk wrote:
> Rework recipe
>
> - remove legacy of the autotools buildsystem
> - remove BBCLASSEXTEND
> - build vapi dependent on gi-data
> - docs require gir, add a EXTRA_OEMESON:append to avoid fail in
> a combination where docs=true and gir=false
> - gtk+3 and gtk4 are requested by default-> add gtk4 depending
> on DISTRO_FEATURE
> - install systemd support files depending on DISTRO_FEATURE
> - update 0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch
>
> Signed-off-by: Markus Volk <f_l_k@t-online.de>
> ---
> ...EXITCODE-macro-for-non-glibc-systems.patch | 35 ++++++++-----------
> .../vte/{vte_0.72.2.bb => vte_0.74.0.bb} | 29 ++++++---------
> 2 files changed, 25 insertions(+), 39 deletions(-)
> rename meta/recipes-support/vte/{vte_0.72.2.bb => vte_0.74.0.bb} (67%)
>
> diff --git a/meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch b/meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch
> index b4100fc381..8934d5f80a 100644
> --- a/meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch
> +++ b/meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch
> @@ -11,32 +11,25 @@ Upstream-Status: Submitted [1]
> Signed-off-by: Andreas M�ller <schnitzeltony@gmail.com>
>
> [1] https://gitlab.gnome.org/GNOME/vte/issues/72
> -
> ---
> - src/missing.hh | 4 ++++
> - src/widget.cc | 1 +
> - 2 files changed, 5 insertions(+)
> + src/widget.cc | 4 +++
> + 1 files changed, 4 insertions(+)
>
> ---- a/src/missing.hh
> -+++ b/src/missing.hh
> -@@ -24,6 +24,10 @@
> - #define NSIG (8 * sizeof(sigset_t))
> - #endif
> +diff --git a/src/widget.cc b/src/widget.cc
> +index 07f7cabf..31a77f68 100644
> +--- a/src/widget.cc
> ++++ b/src/widget.cc
> +@@ -16,6 +16,10 @@
> + * along with this library. If not, see <https://www.gnu.org/licenses/>.
> + */
>
> +#ifndef W_EXITCODE
> +#define W_EXITCODE(ret, sig) ((ret) << 8 | (sig))
> +#endif
> +
> - #ifndef HAVE_FDWALK
> - int fdwalk(int (*cb)(void* data, int fd),
> - void* data);
> ---- a/src/widget.cc
> -+++ b/src/widget.cc
> -@@ -21,6 +21,7 @@
> - #include "widget.hh"
> -
> - #include <sys/wait.h> // for W_EXITCODE
> -+#include "missing.hh" // for W_EXITCODE on non-glibc systems
> + #include "config.h"
>
> - #include <exception>
> - #include <new>
> + #include "widget.hh"
> +--
> +2.42.0
> +
> diff --git a/meta/recipes-support/vte/vte_0.72.2.bb b/meta/recipes-support/vte/vte_0.74.0.bb
> similarity index 67%
> rename from meta/recipes-support/vte/vte_0.72.2.bb
> rename to meta/recipes-support/vte/vte_0.74.0.bb
> index 4249b75ac0..aeaf088598 100644
> --- a/meta/recipes-support/vte/vte_0.72.2.bb
> +++ b/meta/recipes-support/vte/vte_0.74.0.bb
> @@ -17,32 +17,27 @@ GNOMEBASEBUILDCLASS = "meson"
> GIR_MESON_OPTION = 'gir'
> GIDOCGEN_MESON_OPTION = "docs"
>
> -inherit gnomebase gi-docgen features_check upstream-version-is-even gobject-introspection
> +inherit gnomebase gi-docgen features_check upstream-version-is-even gobject-introspection vala
>
> -# vapigen.m4 is required when vala is not present (but the one from vala should be used normally)
> SRC_URI += "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch"
> -SRC_URI[archive.sha256sum] = "f7966fd185a6981f53964162b71cfef7e606495155d6f5827b72aa0dd6741c9e"
> +SRC_URI[archive.sha256sum] = "9ae08f777952ba793221152d360550451580f42d3b570e3341ebb6841984c76b"
>
> ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
>
> -# Help g-ir-scanner find the .so for linking
> -do_compile:prepend() {
> - export GIR_EXTRA_LIBS_PATH="${B}/src/.libs"
> -}
> +EXTRA_OEMESON += "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-Dvapi=true', '-Dvapi=false', d)}"
> +EXTRA_OEMESON:append = " ${@bb.utils.contains('GI_DATA_ENABLED', 'False', '-Ddocs=false', '', d)}"
>
> -# Package additional files
> -FILES:${PN}-dev += "${datadir}/vala/vapi/*"
> -
> -PACKAGECONFIG ??= "gnutls"
> -PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false,vala-native vala"
> +PACKAGECONFIG ??= " \
> + gnutls \
> + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
> + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gtk4', '', d)} \
> +"
> +PACKAGECONFIG[gtk4] = "-Dgtk4=true,-Dgtk4=false,gtk4"
> PACKAGECONFIG[gnutls] = "-Dgnutls=true,-Dgnutls=false,gnutls"
> PACKAGECONFIG[systemd] = "-D_systemd=true,-D_systemd=false,systemd"
> -# vala requires gir
> -PACKAGECONFIG:remove:class-native = "vala"
> -
> -CFLAGS += "-D_GNU_SOURCE"
>
> PACKAGES =+ "libvte ${PN}-prompt"
> +FILES:${PN} +="${systemd_user_unitdir}"
> FILES:libvte = "${libdir}/*.so.* ${libdir}/girepository-1.0/*"
> FILES:${PN}-prompt = " \
> ${sysconfdir}/profile.d \
> @@ -50,5 +45,3 @@ FILES:${PN}-prompt = " \
> "
>
> FILES:${PN}-dev += "${datadir}/glade/"
> -
> -BBCLASSEXTEND = "native nativesdk"
> --
> 2.42.0
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#188095): https://lists.openembedded.org/g/openembedded-core/message/188095
> Mute This Topic: https://lists.openembedded.org/mt/101518552/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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [oe-core][PATCHv7] vte: upgrade 2.72.2 -> 2.74.0
2023-09-25 22:03 ` Alexandre Belloni
@ 2023-09-26 6:38 ` Alexander Kanavin
[not found] ` <17885F8DB02ED3EE.16687@lists.openembedded.org>
1 sibling, 0 replies; 4+ messages in thread
From: Alexander Kanavin @ 2023-09-26 6:38 UTC (permalink / raw)
To: alexandre.belloni; +Cc: Markus Volk, openembedded-core
"| thread 'main' panicked at 'TARGET x86_64-poky-linux-gnux32-gnu is
not a builtin target, and it could not be parsed as a valid triplet:
Unrecognized binary format: gnu',
/home/pokybuild/yocto-worker/qemux86-64-x32/build/build/tmp/work/x86_64_x32-poky-linux-gnux32/librsvg/2.56.3/cargo_home/bitbake/system-deps-6.1.1/src/lib.rs:868:94"
The same failure already happens in master; vte merely adds a
dependency that exposes it on the AB (and vte is not, in itself,
guilty of it).
Looks like rust triplet handling isn't correctly done on x32.
Alex
On Tue, 26 Sept 2023 at 00:03, Alexandre Belloni via
lists.openembedded.org
<alexandre.belloni=bootlin.com@lists.openembedded.org> wrote:
>
> Hello,
>
> It was not clear to me but I'm fairly sure this is what causes this
> failure:
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/57/builds/7719/steps/12/logs/stdio
>
> On 22/09/2023 12:39:51+0200, Markus Volk wrote:
> > Rework recipe
> >
> > - remove legacy of the autotools buildsystem
> > - remove BBCLASSEXTEND
> > - build vapi dependent on gi-data
> > - docs require gir, add a EXTRA_OEMESON:append to avoid fail in
> > a combination where docs=true and gir=false
> > - gtk+3 and gtk4 are requested by default-> add gtk4 depending
> > on DISTRO_FEATURE
> > - install systemd support files depending on DISTRO_FEATURE
> > - update 0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch
> >
> > Signed-off-by: Markus Volk <f_l_k@t-online.de>
> > ---
> > ...EXITCODE-macro-for-non-glibc-systems.patch | 35 ++++++++-----------
> > .../vte/{vte_0.72.2.bb => vte_0.74.0.bb} | 29 ++++++---------
> > 2 files changed, 25 insertions(+), 39 deletions(-)
> > rename meta/recipes-support/vte/{vte_0.72.2.bb => vte_0.74.0.bb} (67%)
> >
> > diff --git a/meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch b/meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch
> > index b4100fc381..8934d5f80a 100644
> > --- a/meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch
> > +++ b/meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch
> > @@ -11,32 +11,25 @@ Upstream-Status: Submitted [1]
> > Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> >
> > [1] https://gitlab.gnome.org/GNOME/vte/issues/72
> > -
> > ---
> > - src/missing.hh | 4 ++++
> > - src/widget.cc | 1 +
> > - 2 files changed, 5 insertions(+)
> > + src/widget.cc | 4 +++
> > + 1 files changed, 4 insertions(+)
> >
> > ---- a/src/missing.hh
> > -+++ b/src/missing.hh
> > -@@ -24,6 +24,10 @@
> > - #define NSIG (8 * sizeof(sigset_t))
> > - #endif
> > +diff --git a/src/widget.cc b/src/widget.cc
> > +index 07f7cabf..31a77f68 100644
> > +--- a/src/widget.cc
> > ++++ b/src/widget.cc
> > +@@ -16,6 +16,10 @@
> > + * along with this library. If not, see <https://www.gnu.org/licenses/>.
> > + */
> >
> > +#ifndef W_EXITCODE
> > +#define W_EXITCODE(ret, sig) ((ret) << 8 | (sig))
> > +#endif
> > +
> > - #ifndef HAVE_FDWALK
> > - int fdwalk(int (*cb)(void* data, int fd),
> > - void* data);
> > ---- a/src/widget.cc
> > -+++ b/src/widget.cc
> > -@@ -21,6 +21,7 @@
> > - #include "widget.hh"
> > -
> > - #include <sys/wait.h> // for W_EXITCODE
> > -+#include "missing.hh" // for W_EXITCODE on non-glibc systems
> > + #include "config.h"
> >
> > - #include <exception>
> > - #include <new>
> > + #include "widget.hh"
> > +--
> > +2.42.0
> > +
> > diff --git a/meta/recipes-support/vte/vte_0.72.2.bb b/meta/recipes-support/vte/vte_0.74.0.bb
> > similarity index 67%
> > rename from meta/recipes-support/vte/vte_0.72.2.bb
> > rename to meta/recipes-support/vte/vte_0.74.0.bb
> > index 4249b75ac0..aeaf088598 100644
> > --- a/meta/recipes-support/vte/vte_0.72.2.bb
> > +++ b/meta/recipes-support/vte/vte_0.74.0.bb
> > @@ -17,32 +17,27 @@ GNOMEBASEBUILDCLASS = "meson"
> > GIR_MESON_OPTION = 'gir'
> > GIDOCGEN_MESON_OPTION = "docs"
> >
> > -inherit gnomebase gi-docgen features_check upstream-version-is-even gobject-introspection
> > +inherit gnomebase gi-docgen features_check upstream-version-is-even gobject-introspection vala
> >
> > -# vapigen.m4 is required when vala is not present (but the one from vala should be used normally)
> > SRC_URI += "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch"
> > -SRC_URI[archive.sha256sum] = "f7966fd185a6981f53964162b71cfef7e606495155d6f5827b72aa0dd6741c9e"
> > +SRC_URI[archive.sha256sum] = "9ae08f777952ba793221152d360550451580f42d3b570e3341ebb6841984c76b"
> >
> > ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
> >
> > -# Help g-ir-scanner find the .so for linking
> > -do_compile:prepend() {
> > - export GIR_EXTRA_LIBS_PATH="${B}/src/.libs"
> > -}
> > +EXTRA_OEMESON += "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-Dvapi=true', '-Dvapi=false', d)}"
> > +EXTRA_OEMESON:append = " ${@bb.utils.contains('GI_DATA_ENABLED', 'False', '-Ddocs=false', '', d)}"
> >
> > -# Package additional files
> > -FILES:${PN}-dev += "${datadir}/vala/vapi/*"
> > -
> > -PACKAGECONFIG ??= "gnutls"
> > -PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false,vala-native vala"
> > +PACKAGECONFIG ??= " \
> > + gnutls \
> > + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
> > + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gtk4', '', d)} \
> > +"
> > +PACKAGECONFIG[gtk4] = "-Dgtk4=true,-Dgtk4=false,gtk4"
> > PACKAGECONFIG[gnutls] = "-Dgnutls=true,-Dgnutls=false,gnutls"
> > PACKAGECONFIG[systemd] = "-D_systemd=true,-D_systemd=false,systemd"
> > -# vala requires gir
> > -PACKAGECONFIG:remove:class-native = "vala"
> > -
> > -CFLAGS += "-D_GNU_SOURCE"
> >
> > PACKAGES =+ "libvte ${PN}-prompt"
> > +FILES:${PN} +="${systemd_user_unitdir}"
> > FILES:libvte = "${libdir}/*.so.* ${libdir}/girepository-1.0/*"
> > FILES:${PN}-prompt = " \
> > ${sysconfdir}/profile.d \
> > @@ -50,5 +45,3 @@ FILES:${PN}-prompt = " \
> > "
> >
> > FILES:${PN}-dev += "${datadir}/glade/"
> > -
> > -BBCLASSEXTEND = "native nativesdk"
> > --
> > 2.42.0
> >
>
> >
> >
> >
>
>
> --
> Alexandre Belloni, co-owner and COO, Bootlin
> Embedded Linux and Kernel engineering
> https://bootlin.com
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#188212): https://lists.openembedded.org/g/openembedded-core/message/188212
> Mute This Topic: https://lists.openembedded.org/mt/101518552/1686489
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [oe-core][PATCHv7] vte: upgrade 2.72.2 -> 2.74.0
[not found] ` <17885F8DB02ED3EE.16687@lists.openembedded.org>
@ 2023-09-26 6:42 ` Alexander Kanavin
0 siblings, 0 replies; 4+ messages in thread
From: Alexander Kanavin @ 2023-09-26 6:42 UTC (permalink / raw)
To: alex.kanavin; +Cc: alexandre.belloni, Markus Volk, openembedded-core
To reproduce:
local.conf:
DEFAULTTUNE = "x86-64-x32"
baselib = "lib32"
bitbake -c install librsvg
Alex
On Tue, 26 Sept 2023 at 08:38, Alexander Kanavin via
lists.openembedded.org <alex.kanavin=gmail.com@lists.openembedded.org>
wrote:
>
> "| thread 'main' panicked at 'TARGET x86_64-poky-linux-gnux32-gnu is
> not a builtin target, and it could not be parsed as a valid triplet:
> Unrecognized binary format: gnu',
> /home/pokybuild/yocto-worker/qemux86-64-x32/build/build/tmp/work/x86_64_x32-poky-linux-gnux32/librsvg/2.56.3/cargo_home/bitbake/system-deps-6.1.1/src/lib.rs:868:94"
>
> The same failure already happens in master; vte merely adds a
> dependency that exposes it on the AB (and vte is not, in itself,
> guilty of it).
>
> Looks like rust triplet handling isn't correctly done on x32.
>
> Alex
>
> On Tue, 26 Sept 2023 at 00:03, Alexandre Belloni via
> lists.openembedded.org
> <alexandre.belloni=bootlin.com@lists.openembedded.org> wrote:
> >
> > Hello,
> >
> > It was not clear to me but I'm fairly sure this is what causes this
> > failure:
> >
> > https://autobuilder.yoctoproject.org/typhoon/#/builders/57/builds/7719/steps/12/logs/stdio
> >
> > On 22/09/2023 12:39:51+0200, Markus Volk wrote:
> > > Rework recipe
> > >
> > > - remove legacy of the autotools buildsystem
> > > - remove BBCLASSEXTEND
> > > - build vapi dependent on gi-data
> > > - docs require gir, add a EXTRA_OEMESON:append to avoid fail in
> > > a combination where docs=true and gir=false
> > > - gtk+3 and gtk4 are requested by default-> add gtk4 depending
> > > on DISTRO_FEATURE
> > > - install systemd support files depending on DISTRO_FEATURE
> > > - update 0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch
> > >
> > > Signed-off-by: Markus Volk <f_l_k@t-online.de>
> > > ---
> > > ...EXITCODE-macro-for-non-glibc-systems.patch | 35 ++++++++-----------
> > > .../vte/{vte_0.72.2.bb => vte_0.74.0.bb} | 29 ++++++---------
> > > 2 files changed, 25 insertions(+), 39 deletions(-)
> > > rename meta/recipes-support/vte/{vte_0.72.2.bb => vte_0.74.0.bb} (67%)
> > >
> > > diff --git a/meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch b/meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch
> > > index b4100fc381..8934d5f80a 100644
> > > --- a/meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch
> > > +++ b/meta/recipes-support/vte/vte/0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch
> > > @@ -11,32 +11,25 @@ Upstream-Status: Submitted [1]
> > > Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
> > >
> > > [1] https://gitlab.gnome.org/GNOME/vte/issues/72
> > > -
> > > ---
> > > - src/missing.hh | 4 ++++
> > > - src/widget.cc | 1 +
> > > - 2 files changed, 5 insertions(+)
> > > + src/widget.cc | 4 +++
> > > + 1 files changed, 4 insertions(+)
> > >
> > > ---- a/src/missing.hh
> > > -+++ b/src/missing.hh
> > > -@@ -24,6 +24,10 @@
> > > - #define NSIG (8 * sizeof(sigset_t))
> > > - #endif
> > > +diff --git a/src/widget.cc b/src/widget.cc
> > > +index 07f7cabf..31a77f68 100644
> > > +--- a/src/widget.cc
> > > ++++ b/src/widget.cc
> > > +@@ -16,6 +16,10 @@
> > > + * along with this library. If not, see <https://www.gnu.org/licenses/>.
> > > + */
> > >
> > > +#ifndef W_EXITCODE
> > > +#define W_EXITCODE(ret, sig) ((ret) << 8 | (sig))
> > > +#endif
> > > +
> > > - #ifndef HAVE_FDWALK
> > > - int fdwalk(int (*cb)(void* data, int fd),
> > > - void* data);
> > > ---- a/src/widget.cc
> > > -+++ b/src/widget.cc
> > > -@@ -21,6 +21,7 @@
> > > - #include "widget.hh"
> > > -
> > > - #include <sys/wait.h> // for W_EXITCODE
> > > -+#include "missing.hh" // for W_EXITCODE on non-glibc systems
> > > + #include "config.h"
> > >
> > > - #include <exception>
> > > - #include <new>
> > > + #include "widget.hh"
> > > +--
> > > +2.42.0
> > > +
> > > diff --git a/meta/recipes-support/vte/vte_0.72.2.bb b/meta/recipes-support/vte/vte_0.74.0.bb
> > > similarity index 67%
> > > rename from meta/recipes-support/vte/vte_0.72.2.bb
> > > rename to meta/recipes-support/vte/vte_0.74.0.bb
> > > index 4249b75ac0..aeaf088598 100644
> > > --- a/meta/recipes-support/vte/vte_0.72.2.bb
> > > +++ b/meta/recipes-support/vte/vte_0.74.0.bb
> > > @@ -17,32 +17,27 @@ GNOMEBASEBUILDCLASS = "meson"
> > > GIR_MESON_OPTION = 'gir'
> > > GIDOCGEN_MESON_OPTION = "docs"
> > >
> > > -inherit gnomebase gi-docgen features_check upstream-version-is-even gobject-introspection
> > > +inherit gnomebase gi-docgen features_check upstream-version-is-even gobject-introspection vala
> > >
> > > -# vapigen.m4 is required when vala is not present (but the one from vala should be used normally)
> > > SRC_URI += "file://0001-Add-W_EXITCODE-macro-for-non-glibc-systems.patch"
> > > -SRC_URI[archive.sha256sum] = "f7966fd185a6981f53964162b71cfef7e606495155d6f5827b72aa0dd6741c9e"
> > > +SRC_URI[archive.sha256sum] = "9ae08f777952ba793221152d360550451580f42d3b570e3341ebb6841984c76b"
> > >
> > > ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}"
> > >
> > > -# Help g-ir-scanner find the .so for linking
> > > -do_compile:prepend() {
> > > - export GIR_EXTRA_LIBS_PATH="${B}/src/.libs"
> > > -}
> > > +EXTRA_OEMESON += "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-Dvapi=true', '-Dvapi=false', d)}"
> > > +EXTRA_OEMESON:append = " ${@bb.utils.contains('GI_DATA_ENABLED', 'False', '-Ddocs=false', '', d)}"
> > >
> > > -# Package additional files
> > > -FILES:${PN}-dev += "${datadir}/vala/vapi/*"
> > > -
> > > -PACKAGECONFIG ??= "gnutls"
> > > -PACKAGECONFIG[vala] = "-Dvapi=true,-Dvapi=false,vala-native vala"
> > > +PACKAGECONFIG ??= " \
> > > + gnutls \
> > > + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
> > > + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gtk4', '', d)} \
> > > +"
> > > +PACKAGECONFIG[gtk4] = "-Dgtk4=true,-Dgtk4=false,gtk4"
> > > PACKAGECONFIG[gnutls] = "-Dgnutls=true,-Dgnutls=false,gnutls"
> > > PACKAGECONFIG[systemd] = "-D_systemd=true,-D_systemd=false,systemd"
> > > -# vala requires gir
> > > -PACKAGECONFIG:remove:class-native = "vala"
> > > -
> > > -CFLAGS += "-D_GNU_SOURCE"
> > >
> > > PACKAGES =+ "libvte ${PN}-prompt"
> > > +FILES:${PN} +="${systemd_user_unitdir}"
> > > FILES:libvte = "${libdir}/*.so.* ${libdir}/girepository-1.0/*"
> > > FILES:${PN}-prompt = " \
> > > ${sysconfdir}/profile.d \
> > > @@ -50,5 +45,3 @@ FILES:${PN}-prompt = " \
> > > "
> > >
> > > FILES:${PN}-dev += "${datadir}/glade/"
> > > -
> > > -BBCLASSEXTEND = "native nativesdk"
> > > --
> > > 2.42.0
> > >
> >
> > >
> > >
> > >
> >
> >
> > --
> > Alexandre Belloni, co-owner and COO, Bootlin
> > Embedded Linux and Kernel engineering
> > https://bootlin.com
> >
> >
> >
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#188218): https://lists.openembedded.org/g/openembedded-core/message/188218
> Mute This Topic: https://lists.openembedded.org/mt/101518552/1686489
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alex.kanavin@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-09-26 6:43 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-22 10:39 [oe-core][PATCHv7] vte: upgrade 2.72.2 -> 2.74.0 Markus Volk
2023-09-25 22:03 ` Alexandre Belloni
2023-09-26 6:38 ` Alexander Kanavin
[not found] ` <17885F8DB02ED3EE.16687@lists.openembedded.org>
2023-09-26 6:42 ` Alexander Kanavin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox