summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2018-04-06 12:35:14 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-04 13:28:04 +0100
commitdabd0c0c11258021570ae3b05de88f1227fd1e21 (patch)
treed4b0d51de298401f243f695d2c7a41fa1790ba59
parenta8eb3f63014bf0a428f547bc91e0c6ad5aa96cd6 (diff)
downloadpoky-dabd0c0c11258021570ae3b05de88f1227fd1e21.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. (From OE-Core rev: 31dfa9983e8793977936f52ec860b1476ec37e18) 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.patch28
-rw-r--r--meta/recipes-support/atk/atk_2.28.1.bb3
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 @@
1From 3838757d29590cc1ef99c97f7268377322fc17e9 Mon Sep 17 00:00:00 2001
2From: Anuj Mittal <anuj.mittal@intel.com>
3Date: Fri, 6 Apr 2018 12:04:00 +0800
4Subject: [PATCH] meson.build: enable introspection for cross-compile
5
6It works fine in OE-core and doesn't need to be disabled. Let the user decide
7if it should be disabled or not.
8
9Upstream-Status: Pending
10
11Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
12---
13 atk/meson.build | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/atk/meson.build b/atk/meson.build
17index 7b5a683..855e28f 100644
18--- a/atk/meson.build
19+++ b/atk/meson.build
20@@ -139,7 +139,7 @@ libatk_dep = declare_dependency(link_with: libatk,
21
22 disable_introspection = get_option('disable_introspection')
23
24-if not meson.is_cross_build() and not disable_introspection
25+if not disable_introspection
26 gnome.generate_gir(libatk,
27 sources: atk_sources + atk_headers + [ atk_enum_h ] + [ atk_version_h ],
28 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
25EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '${GTKDOC_ENABLE_FLAG}', \ 25EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '${GTKDOC_ENABLE_FLAG}', \
26 '${GTKDOC_DISABLE_FLAG}', d)} " 26 '${GTKDOC_DISABLE_FLAG}', d)} "
27 27
28SRC_URI_append = " \
29 file://0001-meson.build-enable-introspection-for-cross-compile.patch \
30 "
28SRC_URI[archive.md5sum] = "dfb5e7474220afa3f4ca7e45af9f3a11" 31SRC_URI[archive.md5sum] = "dfb5e7474220afa3f4ca7e45af9f3a11"
29SRC_URI[archive.sha256sum] = "cd3a1ea6ecc268a2497f0cd018e970860de24a6d42086919d6bf6c8e8d53f4fc" 32SRC_URI[archive.sha256sum] = "cd3a1ea6ecc268a2497f0cd018e970860de24a6d42086919d6bf6c8e8d53f4fc"
30 33