diff options
| author |   Anuj Mittal <anuj.mittal@intel.com> | 2018-04-06 12:35:14 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-05-04 09:54:55 +0100 |
| commit | 31dfa9983e8793977936f52ec860b1476ec37e18 (patch) | |
| tree | 86743d0fea909ac81cda2e2a1d72bdb65783798b | |
| parent | d06b0f899f840fb1a9b15584e6cf272a6f7f2562 (diff) | |
| download | openembedded-core-31dfa9983e8793977936f52ec860b1476ec37e18.tar.gz | |
atk: make sure that introspection is enabled
Fix the meson flags to make sure that introspection files are built
when it is enabled.
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch | 28 | ||||
| -rw-r--r-- | meta/recipes-support/atk/atk_2.28.1.bb | 3 |
2 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch b/meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch new file mode 100644 index 0000000000..c604a984a4 --- /dev/null +++ b/meta/recipes-support/atk/atk/0001-meson.build-enable-introspection-for-cross-compile.patch @@ -0,0 +1,28 @@ +From 3838757d29590cc1ef99c97f7268377322fc17e9 Mon Sep 17 00:00:00 2001 +From: Anuj Mittal <anuj.mittal@intel.com> +Date: Fri, 6 Apr 2018 12:04:00 +0800 +Subject: [PATCH] meson.build: enable introspection for cross-compile + +It works fine in OE-core and doesn't need to be disabled. Let the user decide +if it should be disabled or not. + +Upstream-Status: Pending + +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> +--- + atk/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/atk/meson.build b/atk/meson.build +index 7b5a683..855e28f 100644 +--- a/atk/meson.build ++++ b/atk/meson.build +@@ -139,7 +139,7 @@ libatk_dep = declare_dependency(link_with: libatk, + + disable_introspection = get_option('disable_introspection') + +-if not meson.is_cross_build() and not disable_introspection ++if not disable_introspection + gnome.generate_gir(libatk, + sources: atk_sources + atk_headers + [ atk_enum_h ] + [ atk_version_h ], + namespace: 'Atk', diff --git a/meta/recipes-support/atk/atk_2.28.1.bb b/meta/recipes-support/atk/atk_2.28.1.bb index b23344656c..657c69d576 100644 --- a/meta/recipes-support/atk/atk_2.28.1.bb +++ b/meta/recipes-support/atk/atk_2.28.1.bb @@ -25,6 +25,9 @@ EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'T EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '${GTKDOC_ENABLE_FLAG}', \ '${GTKDOC_DISABLE_FLAG}', d)} " +SRC_URI_append = " \ + file://0001-meson.build-enable-introspection-for-cross-compile.patch \ + " SRC_URI[archive.md5sum] = "dfb5e7474220afa3f4ca7e45af9f3a11" SRC_URI[archive.sha256sum] = "cd3a1ea6ecc268a2497f0cd018e970860de24a6d42086919d6bf6c8e8d53f4fc" |