diff mbox series

[05/13] networkmanager: enable Vala iff gobject-introspection is available

Message ID 20230519163440.2733149-5-ross.burton@arm.com
State Under Review
Headers show
Series [01/13] libblockdev: add PACKAGECONFIG for tools | expand

Commit Message

Ross Burton May 19, 2023, 4:34 p.m. UTC
From: Ross Burton <ross.burton@arm.com>

If vala is enabled but gobject-introspection isn't:

  meson.build:816:4: ERROR: Assert failed: vala api require GObject
  introspection. Use -Dvapi=false to disable it

Signed-off-by: Ross Burton <ross.burton@arm.com>
---
 .../networkmanager/networkmanager_1.42.6.bb                    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Khem Raj May 20, 2023, 12:09 a.m. UTC | #1
On Fri, May 19, 2023 at 9:34 AM Ross Burton <ross.burton@arm.com> wrote:
>
> From: Ross Burton <ross.burton@arm.com>
>
> If vala is enabled but gobject-introspection isn't:
>
>   meson.build:816:4: ERROR: Assert failed: vala api require GObject
>   introspection. Use -Dvapi=false to disable it
>
> Signed-off-by: Ross Burton <ross.burton@arm.com>
> ---
>  .../networkmanager/networkmanager_1.42.6.bb                    | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.42.6.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.42.6.bb
> index 31687a30b9..ec386a4fb1 100644
> --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.42.6.bb
> +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.42.6.bb
> @@ -70,11 +70,12 @@ do_compile:prepend() {
>      export GI_TYPELIB_PATH="${B}}/src/libnm-client-impl${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}"
>  }
>
> -PACKAGECONFIG ??= "readline nss ifupdown dnsmasq nmcli vala \
> +PACKAGECONFIG ??= "readline nss ifupdown dnsmasq nmcli \
>      ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d), d)} \
>      ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez5', '', d)} \
>      ${@bb.utils.filter('DISTRO_FEATURES', 'wifi polkit', d)} \
>      ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux audit', '', d)} \
> +    ${@bb.utils.contains('DISTRO_FEATURES', 'gobject-introspection-data', 'vala', '', d)} \
>  "

This ends up in errors

https://errors.yoctoproject.org/Errors/Details/704795/

When gobject-introspection-data is in DISTRO_FEATURES

>
>  inherit ${@bb.utils.contains('PACKAGECONFIG', 'vala', 'vala', '', d)}
> --
> 2.34.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#102679): https://lists.openembedded.org/g/openembedded-devel/message/102679
> Mute This Topic: https://lists.openembedded.org/mt/99015894/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
diff mbox series

Patch

diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.42.6.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.42.6.bb
index 31687a30b9..ec386a4fb1 100644
--- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.42.6.bb
+++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.42.6.bb
@@ -70,11 +70,12 @@  do_compile:prepend() {
     export GI_TYPELIB_PATH="${B}}/src/libnm-client-impl${GI_TYPELIB_PATH:+:$GI_TYPELIB_PATH}"
 }
 
-PACKAGECONFIG ??= "readline nss ifupdown dnsmasq nmcli vala \
+PACKAGECONFIG ??= "readline nss ifupdown dnsmasq nmcli \
     ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', bb.utils.contains('DISTRO_FEATURES', 'x11', 'consolekit', '', d), d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez5', '', d)} \
     ${@bb.utils.filter('DISTRO_FEATURES', 'wifi polkit', d)} \
     ${@bb.utils.contains('DISTRO_FEATURES', 'selinux', 'selinux audit', '', d)} \
+    ${@bb.utils.contains('DISTRO_FEATURES', 'gobject-introspection-data', 'vala', '', d)} \
 "
 
 inherit ${@bb.utils.contains('PACKAGECONFIG', 'vala', 'vala', '', d)}