mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-03-19 13:49:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

json-glib: convert to meson build

Browse Source 
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>
This commit is contained in:
Alexander Kanavin
2018-01-04 15:12:32 +02:00
committed by Richard Purdie
parent 0dab296d48
commit 7e1df9f68a
2 changed files with 54 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
meta/recipes-gnome/json-glib/json-glib/0001-Do-not-disable-gobject-introspection-when-cross-comp.patch Normal file
View File

@@ -0,0 +1,32 @@
From 293452c963188666dae99521294f09a0cf9582e2 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Fri, 4 Aug 2017 16:01:11 +0300
Subject: [PATCH] Do not disable gobject introspection when cross-compiling.
Introspection does work fine for instance in Open Embedded,
one of the most prominent cross-compilation frameworks
(through qemu emulating target hardware), so let the user
decide if he wants the feature or not.
Upstream-Status: Pending
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 43cbfd9..8a32f26 100644
--- a/meson.build
+++ b/meson.build
@@ -147,7 +147,7 @@ root_dir = include_directories('.')
gnome = import('gnome')
gir = find_program('g-ir-scanner', required: false)
-build_gir = gir.found() and not meson.is_cross_build() and not get_option('disable_introspection')
+build_gir = gir.found() and not get_option('disable_introspection')
subdir('json-glib')
--
2.13.2

24
meta/recipes-gnome/json-glib/json-glib_1.2.8.bb
View File

@@ -10,11 +10,31 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
DEPENDS = "glib-2.0"
SRC_URI_append = " \
file://0001-Do-not-disable-gobject-introspection-when-cross-comp.patch \
"
SRC_URI[archive.md5sum] = "ff31e7d0594df44318e12facda3d086e"
SRC_URI[archive.sha256sum] = "fd55a9037d39e7a10f0db64309f5f0265fa32ec962bf85066087b83a2807f40a"
inherit gnomebase gettext lib_package gobject-introspection gtk-doc manpages
GNOMEBASEBUILDCLASS = "meson"
inherit gnomebase lib_package gobject-introspection gtk-doc manpages
PACKAGECONFIG[manpages] = "--enable-man --with-xml-catalog=${STAGING_ETCDIR_NATIVE}/xml/catalog.xml, --disable-man, libxslt-native xmlto-native"
GTKDOC_ENABLE_FLAG = "-Denable-gtk-doc=true"
GTKDOC_DISABLE_FLAG = "-Denable-gtk-doc=false"
GI_ENABLE_FLAG = "-Ddisable_introspection=false"
GI_DISABLE_FLAG = "-Ddisable_introspection=true"
EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '${GTKDOC_ENABLE_FLAG}', \
'${GTKDOC_DISABLE_FLAG}', d)} "
EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '${GI_ENABLE_FLAG}', \
'${GI_DISABLE_FLAG}', d)} "
PACKAGECONFIG[manpages] = "-Denable-man=true, -Denable-man=false, libxslt-native xmlto-native"
do_install_append() {
# FIXME: these need to be provided via ptest
rm -rf ${D}${datadir}/installed-tests ${D}${libexecdir}
}
BBCLASSEXTEND = "native nativesdk"