diff options
Diffstat (limited to 'meta/recipes-gnome/gobject-introspection/gobject-introspection_1.58.0.bb')
-rw-r--r-- | meta/recipes-gnome/gobject-introspection/gobject-introspection_1.58.0.bb | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.58.0.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.58.0.bb index 55ca87ddaa..c9a0d816f5 100644 --- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.58.0.bb +++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.58.0.bb | |||
@@ -19,6 +19,7 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-$ | |||
19 | file://0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch \ | 19 | file://0001-giscanner-ignore-error-return-codes-from-ldd-wrapper.patch \ |
20 | file://0001-configure.ac-make-GIR_DIR-configurable.patch \ | 20 | file://0001-configure.ac-make-GIR_DIR-configurable.patch \ |
21 | file://0002-g-ir-tools-respect-gir_dir_prefix.patch \ | 21 | file://0002-g-ir-tools-respect-gir_dir_prefix.patch \ |
22 | file://0001-Port-cross-compilation-support-to-meson.patch \ | ||
22 | " | 23 | " |
23 | 24 | ||
24 | SRC_URI[md5sum] = "94fec875276262037bfcd51226db12fe" | 25 | SRC_URI[md5sum] = "94fec875276262037bfcd51226db12fe" |
@@ -26,7 +27,7 @@ SRC_URI[sha256sum] = "27c1590a32749de0a5481ce897772547043e94bccba4bc0a7edb3d8513 | |||
26 | 27 | ||
27 | SRC_URI_append_class-native = " file://0001-Relocate-the-repository-directory-for-native-builds.patch" | 28 | SRC_URI_append_class-native = " file://0001-Relocate-the-repository-directory-for-native-builds.patch" |
28 | 29 | ||
29 | inherit autotools pkgconfig gtk-doc python3native qemu gobject-introspection-data upstream-version-is-even multilib_script | 30 | inherit meson pkgconfig gtk-doc python3native qemu gobject-introspection-data upstream-version-is-even multilib_script |
30 | 31 | ||
31 | MULTILIB_SCRIPTS = "${PN}:${bindir}/g-ir-annotation-tool ${PN}:${bindir}/g-ir-scanner" | 32 | MULTILIB_SCRIPTS = "${PN}:${bindir}/g-ir-annotation-tool ${PN}:${bindir}/g-ir-scanner" |
32 | 33 | ||
@@ -44,17 +45,17 @@ export STAGING_DIR_HOST | |||
44 | export B | 45 | export B |
45 | 46 | ||
46 | PACKAGECONFIG ?= "" | 47 | PACKAGECONFIG ?= "" |
47 | PACKAGECONFIG[doctool] = "--enable-doctool,--disable-doctool,python3-mako," | 48 | PACKAGECONFIG[doctool] = "-Ddoctool=true,-Ddoctool=false,python3-mako," |
48 | 49 | ||
49 | # Configure target build to use native tools of itself and to use a qemu wrapper | 50 | # Configure target build to use native tools of itself and to use a qemu wrapper |
50 | # and optionally to generate introspection data | 51 | # and optionally to generate introspection data |
51 | EXTRA_OECONF_class-target = " \ | 52 | EXTRA_OEMESON_class-target = " \ |
52 | --disable-static \ | 53 | -Denable-host-gi=true \ |
53 | --enable-host-gi \ | 54 | -Denable-gi-cross-wrapper=${B}/g-ir-scanner-qemuwrapper \ |
54 | --enable-gi-cross-wrapper=${B}/g-ir-scanner-qemuwrapper \ | 55 | -Denable-gi-ldd-wrapper=${B}/g-ir-scanner-lddwrapper \ |
55 | --enable-gi-ldd-wrapper=${B}/g-ir-scanner-lddwrapper \ | 56 | -Dpkgconfig-sysroot-path=${PKG_CONFIG_SYSROOT_DIR} \ |
56 | ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '--enable-introspection-data', '--disable-introspection-data', d)} \ | 57 | ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-Denable-introspection-data=true', '-Denable-introspection-data=false', d)} \ |
57 | ${@'--with-gir-dir-prefix=${libdir}' if d.getVar('MULTILIBS') else ''} \ | 58 | ${@'-Dgir-dir-prefix=${libdir}' if d.getVar('MULTILIBS') else ''} \ |
58 | " | 59 | " |
59 | 60 | ||
60 | # Need to ensure ld.so.conf exists so prelink-native works | 61 | # Need to ensure ld.so.conf exists so prelink-native works |