summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/json-glib
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2018-01-04 15:12:32 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-05 12:02:37 +0000
commit7e1df9f68a444b1d6ee1895f272b6de8ba1c031a (patch)
tree782c430f5c5638b6573e127921d01c7280486e4c /meta/recipes-gnome/json-glib
parent0dab296d48418ef1b4f1f724b8ae21c527c1a027 (diff)
downloadpoky-7e1df9f68a444b1d6ee1895f272b6de8ba1c031a.tar.gz
json-glib: convert to meson build
Note that meson flags for gobject introspection and gtk-doc appear to be non-standardized; going forward we should devise a common way to deal with it. gettext inherit is removed, as there is no equivalent functionality in meson; NLS bits are always built and installed. (From OE-Core rev: 3d63c2cd2e8da0206297c69cdbdbf2688c13a9be) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/json-glib')
-rw-r--r--meta/recipes-gnome/json-glib/json-glib/0001-Do-not-disable-gobject-introspection-when-cross-comp.patch32
-rw-r--r--meta/recipes-gnome/json-glib/json-glib_1.2.8.bb24
2 files changed, 54 insertions, 2 deletions
diff --git a/meta/recipes-gnome/json-glib/json-glib/0001-Do-not-disable-gobject-introspection-when-cross-comp.patch b/meta/recipes-gnome/json-glib/json-glib/0001-Do-not-disable-gobject-introspection-when-cross-comp.patch
new file mode 100644
index 0000000000..849bb9d316
--- /dev/null
+++ b/meta/recipes-gnome/json-glib/json-glib/0001-Do-not-disable-gobject-introspection-when-cross-comp.patch
@@ -0,0 +1,32 @@
1From 293452c963188666dae99521294f09a0cf9582e2 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 4 Aug 2017 16:01:11 +0300
4Subject: [PATCH] Do not disable gobject introspection when cross-compiling.
5
6Introspection does work fine for instance in Open Embedded,
7one of the most prominent cross-compilation frameworks
8(through qemu emulating target hardware), so let the user
9decide if he wants the feature or not.
10
11Upstream-Status: Pending
12Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
13---
14 meson.build | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17diff --git a/meson.build b/meson.build
18index 43cbfd9..8a32f26 100644
19--- a/meson.build
20+++ b/meson.build
21@@ -147,7 +147,7 @@ root_dir = include_directories('.')
22
23 gnome = import('gnome')
24 gir = find_program('g-ir-scanner', required: false)
25-build_gir = gir.found() and not meson.is_cross_build() and not get_option('disable_introspection')
26+build_gir = gir.found() and not get_option('disable_introspection')
27
28 subdir('json-glib')
29
30--
312.13.2
32
diff --git a/meta/recipes-gnome/json-glib/json-glib_1.2.8.bb b/meta/recipes-gnome/json-glib/json-glib_1.2.8.bb
index 2c5d3817ba..88653efec7 100644
--- a/meta/recipes-gnome/json-glib/json-glib_1.2.8.bb
+++ b/meta/recipes-gnome/json-glib/json-glib_1.2.8.bb
@@ -10,11 +10,31 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
10 10
11DEPENDS = "glib-2.0" 11DEPENDS = "glib-2.0"
12 12
13SRC_URI_append = " \
14 file://0001-Do-not-disable-gobject-introspection-when-cross-comp.patch \
15 "
13SRC_URI[archive.md5sum] = "ff31e7d0594df44318e12facda3d086e" 16SRC_URI[archive.md5sum] = "ff31e7d0594df44318e12facda3d086e"
14SRC_URI[archive.sha256sum] = "fd55a9037d39e7a10f0db64309f5f0265fa32ec962bf85066087b83a2807f40a" 17SRC_URI[archive.sha256sum] = "fd55a9037d39e7a10f0db64309f5f0265fa32ec962bf85066087b83a2807f40a"
15 18
16inherit gnomebase gettext lib_package gobject-introspection gtk-doc manpages 19GNOMEBASEBUILDCLASS = "meson"
20inherit gnomebase lib_package gobject-introspection gtk-doc manpages
17 21
18PACKAGECONFIG[manpages] = "--enable-man --with-xml-catalog=${STAGING_ETCDIR_NATIVE}/xml/catalog.xml, --disable-man, libxslt-native xmlto-native" 22GTKDOC_ENABLE_FLAG = "-Denable-gtk-doc=true"
23GTKDOC_DISABLE_FLAG = "-Denable-gtk-doc=false"
24
25GI_ENABLE_FLAG = "-Ddisable_introspection=false"
26GI_DISABLE_FLAG = "-Ddisable_introspection=true"
27
28EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '${GTKDOC_ENABLE_FLAG}', \
29 '${GTKDOC_DISABLE_FLAG}', d)} "
30EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '${GI_ENABLE_FLAG}', \
31 '${GI_DISABLE_FLAG}', d)} "
32
33PACKAGECONFIG[manpages] = "-Denable-man=true, -Denable-man=false, libxslt-native xmlto-native"
34
35do_install_append() {
36 # FIXME: these need to be provided via ptest
37 rm -rf ${D}${datadir}/installed-tests ${D}${libexecdir}
38}
19 39
20BBCLASSEXTEND = "native nativesdk" 40BBCLASSEXTEND = "native nativesdk"