[PATCH] [krogoth] gobject-introspection.bbclass: disable introspection for -native and -nativesdk recipes

[PATCH] [krogoth] gobject-introspection.bbclass: disable introspection for -native and -nativesdk recipes

[Zeeshan Ali]

From: Alexander Kanavin <alexander.kanavin@linux.intel.com>

It is not necessary for those targets, adds to the build time, and pulls
in the unneeded qemu-native dependency.

(From OE-Core rev: be18364edd5cd2c664f68120063a1e147563faab)

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/classes/gobject-introspection.bbclass | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/meta/classes/gobject-introspection.bbclass b/meta/classes/gobject-introspection.bbclass
index 2d73e40..cc7ca5a 100644
--- a/meta/classes/gobject-introspection.bbclass
+++ b/meta/classes/gobject-introspection.bbclass
@@ -3,13 +3,23 @@
 # This sets up autoconf-based recipes to build introspection data (or not),
 # depending on distro and machine features (see gobject-introspection-data class).
 inherit gobject-introspection-data
-EXTRA_OECONF_prepend = "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '--enable-introspection', '--disable-introspection', d)} "
+EXTRA_OECONF_prepend_class-target = "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '--enable-introspection', '--disable-introspection', d)} "
+
+# When building native recipes, disable introspection, as it is not necessary,
+# pulls in additional dependencies, and makes build times longer
+EXTRA_OECONF_prepend_class-native = "--disable-introspection "
+EXTRA_OECONF_prepend_class-nativesdk = "--disable-introspection "
 
 UNKNOWN_CONFIGURE_WHITELIST_append = " --enable-introspection --disable-introspection"
 
 # Generating introspection data depends on a combination of native and target
 # introspection tools, and qemu to run the target tools.
-DEPENDS_append = " gobject-introspection gobject-introspection-native qemu-native"
+DEPENDS_append_class-target = " gobject-introspection gobject-introspection-native qemu-native"
+
+# Even though introspection is disabled on -native, gobject-introspection package is still
+# needed for m4 macros.
+DEPENDS_append_class-native = " gobject-introspection-native"
+DEPENDS_append_class-nativesdk = " gobject-introspection-native"
 
 # This is necessary for python scripts to succeed - distutils fails if these
 # are not set
-- 
2.7.4

Re: [PATCH] [krogoth] gobject-introspection.bbclass: disable introspection for -native and -nativesdk recipes

[Zeeshan Ali]

Hi,

Could we please cherry-pick this? Otherwise some native recipes fail
to build if gobject-introspection is available on host.

On Mon, Sep 12, 2016 at 4:00 PM, Zeeshan Ali <zeenix@gmail.com> wrote:
> From: Alexander Kanavin <alexander.kanavin@linux.intel.com>
>
> It is not necessary for those targets, adds to the build time, and pulls
> in the unneeded qemu-native dependency.
>
> (From OE-Core rev: be18364edd5cd2c664f68120063a1e147563faab)
>
> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
>  meta/classes/gobject-introspection.bbclass | 14 ++++++++++++--
>  1 file changed, 12 insertions(+), 2 deletions(-)
>
> diff --git a/meta/classes/gobject-introspection.bbclass b/meta/classes/gobject-introspection.bbclass
> index 2d73e40..cc7ca5a 100644
> --- a/meta/classes/gobject-introspection.bbclass
> +++ b/meta/classes/gobject-introspection.bbclass
> @@ -3,13 +3,23 @@
>  # This sets up autoconf-based recipes to build introspection data (or not),
>  # depending on distro and machine features (see gobject-introspection-data class).
>  inherit gobject-introspection-data
> -EXTRA_OECONF_prepend = "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '--enable-introspection', '--disable-introspection', d)} "
> +EXTRA_OECONF_prepend_class-target = "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '--enable-introspection', '--disable-introspection', d)} "
> +
> +# When building native recipes, disable introspection, as it is not necessary,
> +# pulls in additional dependencies, and makes build times longer
> +EXTRA_OECONF_prepend_class-native = "--disable-introspection "
> +EXTRA_OECONF_prepend_class-nativesdk = "--disable-introspection "
>
>  UNKNOWN_CONFIGURE_WHITELIST_append = " --enable-introspection --disable-introspection"
>
>  # Generating introspection data depends on a combination of native and target
>  # introspection tools, and qemu to run the target tools.
> -DEPENDS_append = " gobject-introspection gobject-introspection-native qemu-native"
> +DEPENDS_append_class-target = " gobject-introspection gobject-introspection-native qemu-native"
> +
> +# Even though introspection is disabled on -native, gobject-introspection package is still
> +# needed for m4 macros.
> +DEPENDS_append_class-native = " gobject-introspection-native"
> +DEPENDS_append_class-nativesdk = " gobject-introspection-native"
>
>  # This is necessary for python scripts to succeed - distutils fails if these
>  # are not set
> --
> 2.7.4
>



-- 
Regards,

Zeeshan Ali