summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/gobject-introspection-data.bbclass9
-rw-r--r--meta/classes/gobject-introspection.bbclass8
-rw-r--r--meta/conf/bitbake.conf2
-rw-r--r--meta/conf/machine/include/x86/arch-x86.inc2
-rw-r--r--meta/recipes-gnome/gobject-introspection/gobject-introspection_1.46.0.bb4
-rw-r--r--meta/recipes-sato/webkit/webkitgtk_2.10.7.bb2
6 files changed, 18 insertions, 9 deletions
diff --git a/meta/classes/gobject-introspection-data.bbclass b/meta/classes/gobject-introspection-data.bbclass
new file mode 100644
index 0000000000..b1bdd268e6
--- /dev/null
+++ b/meta/classes/gobject-introspection-data.bbclass
@@ -0,0 +1,9 @@
1# This variable is set to True if gobject-introspection-data is in
2# DISTRO_FEATURES and qemu-usermode is in MACHINE_FEATURES, and False otherwise.
3#
4# It should be used in recipes to determine whether introspection data should be built,
5# so that qemu use can be avoided when necessary.
6GI_DATA_ENABLED = "${@bb.utils.contains('DISTRO_FEATURES', 'gobject-introspection-data', \
7 bb.utils.contains('MACHINE_FEATURES', 'qemu-usermode', 'True', 'False', d), 'False', d)}"
8
9
diff --git a/meta/classes/gobject-introspection.bbclass b/meta/classes/gobject-introspection.bbclass
index d8b8b3ed27..2d73e402ce 100644
--- a/meta/classes/gobject-introspection.bbclass
+++ b/meta/classes/gobject-introspection.bbclass
@@ -1,9 +1,9 @@
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 (and therefore avoiding the use 3# This sets up autoconf-based recipes to build introspection data (or not),
4# of qemu) in recipes if gobject-introspection-data is omitted from 4# depending on distro and machine features (see gobject-introspection-data class).
5# DISTRO_FEATURES or MACHINE_FEATURES. 5inherit gobject-introspection-data
6EXTRA_OECONF_prepend = "${@bb.utils.contains('COMBINED_FEATURES', 'gobject-introspection-data', '--enable-introspection', '--disable-introspection', d)} " 6EXTRA_OECONF_prepend = "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '--enable-introspection', '--disable-introspection', d)} "
7 7
8UNKNOWN_CONFIGURE_WHITELIST_append = " --enable-introspection --disable-introspection" 8UNKNOWN_CONFIGURE_WHITELIST_append = " --enable-introspection --disable-introspection"
9 9
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index e3db5041f3..d4fb5f3571 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -762,7 +762,7 @@ EXTRA_IMAGE_FEATURES ??= ""
762IMAGE_FEATURES += "${EXTRA_IMAGE_FEATURES}" 762IMAGE_FEATURES += "${EXTRA_IMAGE_FEATURES}"
763 763
764DISTRO_FEATURES_BACKFILL = "pulseaudio sysvinit bluez5 gobject-introspection-data" 764DISTRO_FEATURES_BACKFILL = "pulseaudio sysvinit bluez5 gobject-introspection-data"
765MACHINE_FEATURES_BACKFILL = "rtc gobject-introspection-data" 765MACHINE_FEATURES_BACKFILL = "rtc qemu-usermode"
766 766
767COMBINED_FEATURES = "${@oe.utils.set_intersect('DISTRO_FEATURES', 'MACHINE_FEATURES', d)}" 767COMBINED_FEATURES = "${@oe.utils.set_intersect('DISTRO_FEATURES', 'MACHINE_FEATURES', d)}"
768COMBINED_FEATURES[vardeps] += "DISTRO_FEATURES MACHINE_FEATURES" 768COMBINED_FEATURES[vardeps] += "DISTRO_FEATURES MACHINE_FEATURES"
diff --git a/meta/conf/machine/include/x86/arch-x86.inc b/meta/conf/machine/include/x86/arch-x86.inc
index ba7be8ad65..e51d595f74 100644
--- a/meta/conf/machine/include/x86/arch-x86.inc
+++ b/meta/conf/machine/include/x86/arch-x86.inc
@@ -25,7 +25,7 @@ TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'mx32', ' -mx32', '', d)}"
25TUNE_LDARGS += "${@bb.utils.contains('TUNE_FEATURES', 'mx32', '-m elf32_x86_64', '', d)}" 25TUNE_LDARGS += "${@bb.utils.contains('TUNE_FEATURES', 'mx32', '-m elf32_x86_64', '', d)}"
26TUNE_ASARGS += "${@bb.utils.contains('TUNE_FEATURES', 'mx32', '-x32', '', d)}" 26TUNE_ASARGS += "${@bb.utils.contains('TUNE_FEATURES', 'mx32', '-x32', '', d)}"
27# user mode qemu doesn't support x32 27# user mode qemu doesn't support x32
28MACHINE_FEATURES_BACKFILL_CONSIDERED_append = " ${@bb.utils.contains('TUNE_FEATURES', 'mx32', 'gobject-introspection-data', '', d)}" 28MACHINE_FEATURES_BACKFILL_CONSIDERED_append = " ${@bb.utils.contains('TUNE_FEATURES', 'mx32', 'qemu-usermode', '', d)}"
29 29
30# ELF64 ABI 30# ELF64 ABI
31TUNEVALID[m64] = "IA32e (x86_64) ELF64 standard ABI" 31TUNEVALID[m64] = "IA32e (x86_64) ELF64 standard ABI"
diff --git a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.46.0.bb b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.46.0.bb
index b8b88234e7..9b16147da3 100644
--- a/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.46.0.bb
+++ b/meta/recipes-gnome/gobject-introspection/gobject-introspection_1.46.0.bb
@@ -16,7 +16,7 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/1.46/${BPN}-${PV}.tar.xz \
16SRC_URI[md5sum] = "adb40a31c7c80b65b0f4c8fd71b493dc" 16SRC_URI[md5sum] = "adb40a31c7c80b65b0f4c8fd71b493dc"
17SRC_URI[sha256sum] = "6658bd3c2b8813eb3e2511ee153238d09ace9d309e4574af27443d87423e4233" 17SRC_URI[sha256sum] = "6658bd3c2b8813eb3e2511ee153238d09ace9d309e4574af27443d87423e4233"
18 18
19inherit autotools pkgconfig gtk-doc pythonnative qemu 19inherit autotools pkgconfig gtk-doc pythonnative qemu gobject-introspection-data
20BBCLASSEXTEND = "native" 20BBCLASSEXTEND = "native"
21 21
22# necessary to let the call for python-config from configure.ac succeed 22# necessary to let the call for python-config from configure.ac succeed
@@ -105,7 +105,7 @@ EOF
105EXTRA_OECONF_class-target += "--enable-host-gi \ 105EXTRA_OECONF_class-target += "--enable-host-gi \
106 --enable-gi-cross-wrapper=${B}/g-ir-scanner-qemuwrapper \ 106 --enable-gi-cross-wrapper=${B}/g-ir-scanner-qemuwrapper \
107 --enable-gi-ldd-wrapper=${B}/g-ir-scanner-lddwrapper \ 107 --enable-gi-ldd-wrapper=${B}/g-ir-scanner-lddwrapper \
108 ${@bb.utils.contains('COMBINED_FEATURES', 'gobject-introspection-data', '--enable-introspection-data', '--disable-introspection-data', d)} \ 108 ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '--enable-introspection-data', '--disable-introspection-data', d)} \
109 " 109 "
110 110
111 111
diff --git a/meta/recipes-sato/webkit/webkitgtk_2.10.7.bb b/meta/recipes-sato/webkit/webkitgtk_2.10.7.bb
index 849a33a1e7..8eb6b9f3b2 100644
--- a/meta/recipes-sato/webkit/webkitgtk_2.10.7.bb
+++ b/meta/recipes-sato/webkit/webkitgtk_2.10.7.bb
@@ -54,7 +54,7 @@ PACKAGECONFIG[libhyphen] = "-DUSE_LIBHYPHEN=ON,-DUSE_LIBHYPHEN=OFF,libhyphen"
54EXTRA_OECMAKE = " \ 54EXTRA_OECMAKE = " \
55 -DPORT=GTK \ 55 -DPORT=GTK \
56 -DCMAKE_BUILD_TYPE=Release \ 56 -DCMAKE_BUILD_TYPE=Release \
57 ${@bb.utils.contains('COMBINED_FEATURES', 'gobject-introspection-data', '-DENABLE_INTROSPECTION=ON', '-DENABLE_INTROSPECTION=OFF', d)} \ 57 ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_INTROSPECTION=ON', '-DENABLE_INTROSPECTION=OFF', d)} \
58 -DENABLE_GTKDOC=OFF \ 58 -DENABLE_GTKDOC=OFF \
59 -DENABLE_MINIBROWSER=ON \ 59 -DENABLE_MINIBROWSER=ON \
60 " 60 "