diff options
-rw-r--r-- | meta/classes/gobject-introspection.bbclass | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/meta/classes/gobject-introspection.bbclass b/meta/classes/gobject-introspection.bbclass index ef5162974f..d8b8b3ed27 100644 --- a/meta/classes/gobject-introspection.bbclass +++ b/meta/classes/gobject-introspection.bbclass | |||
@@ -1,22 +1,22 @@ | |||
1 | # Inherit this class in recipes to enable building their introspection files | 1 | # Inherit this class in recipes to enable building their introspection files |
2 | 2 | ||
3 | # This allows disabling introspection support in recipes | 3 | # This allows disabling introspection support (and therefore avoiding the use |
4 | # (and therefore avoiding the use of qemu) | 4 | # of qemu) in recipes if gobject-introspection-data is omitted from |
5 | # if gobject-introspection-data is omitted from DISTRO_FEATURES and MACHINE_FEATURES. | 5 | # DISTRO_FEATURES or MACHINE_FEATURES. |
6 | EXTRA_OECONF_prepend = "${@bb.utils.contains('COMBINED_FEATURES', 'gobject-introspection-data', '--enable-introspection', '--disable-introspection', d)} " | 6 | EXTRA_OECONF_prepend = "${@bb.utils.contains('COMBINED_FEATURES', 'gobject-introspection-data', '--enable-introspection', '--disable-introspection', d)} " |
7 | 7 | ||
8 | UNKNOWN_CONFIGURE_WHITELIST_append = " --enable-introspection --disable-introspection" | 8 | UNKNOWN_CONFIGURE_WHITELIST_append = " --enable-introspection --disable-introspection" |
9 | 9 | ||
10 | # Generating introspection data depends on a combination of native and target introspection tools, | 10 | # Generating introspection data depends on a combination of native and target |
11 | # and qemu to run the target tools. | 11 | # introspection tools, and qemu to run the target tools. |
12 | DEPENDS_append = " gobject-introspection gobject-introspection-native qemu-native" | 12 | DEPENDS_append = " gobject-introspection gobject-introspection-native qemu-native" |
13 | 13 | ||
14 | # This is necessary for python scripts to succeed - distutils | 14 | # This is necessary for python scripts to succeed - distutils fails if these |
15 | # failes if these are not set | 15 | # are not set |
16 | export BUILD_SYS | 16 | export BUILD_SYS |
17 | export HOST_SYS | 17 | export HOST_SYS |
18 | export STAGING_LIBDIR | ||
19 | export STAGING_INCDIR | 18 | export STAGING_INCDIR |
19 | export STAGING_LIBDIR | ||
20 | 20 | ||
21 | # This is used by introspection tools to find .gir includes | 21 | # This is used by introspection tools to find .gir includes |
22 | export XDG_DATA_DIRS = "${STAGING_DATADIR}" | 22 | export XDG_DATA_DIRS = "${STAGING_DATADIR}" |
@@ -28,12 +28,10 @@ do_configure_prepend_class-target () { | |||
28 | cp ${STAGING_DIR_TARGET}/${datadir}/aclocal/introspection.m4 ${S}/m4 | 28 | cp ${STAGING_DIR_TARGET}/${datadir}/aclocal/introspection.m4 ${S}/m4 |
29 | } | 29 | } |
30 | 30 | ||
31 | 31 | # .typelib files are needed at runtime and so they go to the main package (so | |
32 | # .typelib files are needed at runtime and so they go to the main package | 32 | # they'll be together with libraries they support). |
33 | # (so they'll be together with libraries they support). | ||
34 | FILES_${PN}_append = " ${libdir}/girepository-*/*.typelib" | 33 | FILES_${PN}_append = " ${libdir}/girepository-*/*.typelib" |
35 | 34 | ||
36 | # .gir files go to dev package, as they're needed for developing (but not for running) | 35 | # .gir files go to dev package, as they're needed for developing (but not for |
37 | # things that depends on introspection. | 36 | # running) things that depends on introspection. |
38 | FILES_${PN}-dev_append = " ${datadir}/gir-*/*.gir" | 37 | FILES_${PN}-dev_append = " ${datadir}/gir-*/*.gir" |
39 | |||