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 | 11 |
1 files changed, 8 insertions, 3 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 2c8cfa6bd9..55ca87ddaa 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 | |||
@@ -17,6 +17,8 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${@oe.utils.trim_version("${PV}", 2)}/${BPN}-$ | |||
17 | file://0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch \ | 17 | file://0005-Prefix-pkg-config-paths-with-PKG_CONFIG_SYSROOT_DIR-.patch \ |
18 | file://0001-giscanner-add-a-lib-dirs-envvar-option.patch \ | 18 | file://0001-giscanner-add-a-lib-dirs-envvar-option.patch \ |
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 \ | ||
21 | file://0002-g-ir-tools-respect-gir_dir_prefix.patch \ | ||
20 | " | 22 | " |
21 | 23 | ||
22 | SRC_URI[md5sum] = "94fec875276262037bfcd51226db12fe" | 24 | SRC_URI[md5sum] = "94fec875276262037bfcd51226db12fe" |
@@ -24,7 +26,9 @@ SRC_URI[sha256sum] = "27c1590a32749de0a5481ce897772547043e94bccba4bc0a7edb3d8513 | |||
24 | 26 | ||
25 | SRC_URI_append_class-native = " file://0001-Relocate-the-repository-directory-for-native-builds.patch" | 27 | SRC_URI_append_class-native = " file://0001-Relocate-the-repository-directory-for-native-builds.patch" |
26 | 28 | ||
27 | inherit autotools pkgconfig gtk-doc python3native qemu gobject-introspection-data upstream-version-is-even | 29 | inherit autotools pkgconfig gtk-doc python3native qemu gobject-introspection-data upstream-version-is-even multilib_script |
30 | |||
31 | MULTILIB_SCRIPTS = "${PN}:${bindir}/g-ir-annotation-tool ${PN}:${bindir}/g-ir-scanner" | ||
28 | 32 | ||
29 | DEPENDS_append = " libffi zlib glib-2.0 python3 flex-native bison-native autoconf-archive" | 33 | DEPENDS_append = " libffi zlib glib-2.0 python3 flex-native bison-native autoconf-archive" |
30 | 34 | ||
@@ -50,6 +54,7 @@ EXTRA_OECONF_class-target = " \ | |||
50 | --enable-gi-cross-wrapper=${B}/g-ir-scanner-qemuwrapper \ | 54 | --enable-gi-cross-wrapper=${B}/g-ir-scanner-qemuwrapper \ |
51 | --enable-gi-ldd-wrapper=${B}/g-ir-scanner-lddwrapper \ | 55 | --enable-gi-ldd-wrapper=${B}/g-ir-scanner-lddwrapper \ |
52 | ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '--enable-introspection-data', '--disable-introspection-data', d)} \ | 56 | ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '--enable-introspection-data', '--disable-introspection-data', d)} \ |
57 | ${@'--with-gir-dir-prefix=${libdir}' if d.getVar('MULTILIBS') else ''} \ | ||
53 | " | 58 | " |
54 | 59 | ||
55 | # Need to ensure ld.so.conf exists so prelink-native works | 60 | # Need to ensure ld.so.conf exists so prelink-native works |
@@ -94,7 +99,7 @@ EOF | |||
94 | # This prevents g-ir-scanner from writing cache data to $HOME | 99 | # This prevents g-ir-scanner from writing cache data to $HOME |
95 | export GI_SCANNER_DISABLE_CACHE=1 | 100 | export GI_SCANNER_DISABLE_CACHE=1 |
96 | 101 | ||
97 | g-ir-scanner --lib-dirs-envvar=GIR_EXTRA_LIBS_PATH --use-binary-wrapper=${STAGING_BINDIR}/g-ir-scanner-qemuwrapper --use-ldd-wrapper=${STAGING_BINDIR}/g-ir-scanner-lddwrapper --add-include-path=${STAGING_DATADIR}/gir-1.0 "\$@" | 102 | g-ir-scanner --lib-dirs-envvar=GIR_EXTRA_LIBS_PATH --use-binary-wrapper=${STAGING_BINDIR}/g-ir-scanner-qemuwrapper --use-ldd-wrapper=${STAGING_BINDIR}/g-ir-scanner-lddwrapper --add-include-path=${STAGING_DATADIR}/gir-1.0 --add-include-path=${STAGING_LIBDIR}/gir-1.0 "\$@" |
98 | EOF | 103 | EOF |
99 | chmod +x ${B}/g-ir-scanner-wrapper | 104 | chmod +x ${B}/g-ir-scanner-wrapper |
100 | 105 | ||
@@ -178,7 +183,7 @@ FILES_${PN}_append = " ${libdir}/girepository-*/*.typelib" | |||
178 | 183 | ||
179 | # .gir files go to dev package, as they're needed for developing (but not for running) | 184 | # .gir files go to dev package, as they're needed for developing (but not for running) |
180 | # things that depends on introspection. | 185 | # things that depends on introspection. |
181 | FILES_${PN}-dev_append = " ${datadir}/gir-*/*.gir" | 186 | FILES_${PN}-dev_append = " ${datadir}/gir-*/*.gir ${libdir}/gir-*/*.gir" |
182 | FILES_${PN}-dev_append = " ${datadir}/gir-*/*.rnc" | 187 | FILES_${PN}-dev_append = " ${datadir}/gir-*/*.rnc" |
183 | 188 | ||
184 | # These are used by gobject-based packages | 189 | # These are used by gobject-based packages |