summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2019-03-26 12:01:57 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-03-29 08:28:52 +0000
commit9bad984bf3fd828a655614568214b6c6c4f99860 (patch)
tree23fae106dc1be8397e13133d7362d00f9fada4bd
parent35742c10f531ba451c06a4e360fecfb55f358b35 (diff)
downloadpoky-9bad984bf3fd828a655614568214b6c6c4f99860.tar.gz
glib: set glib-specific cross properties
GLib wants to execute code to identify several properties of the system, for example is vsprintf() broken and what direction does the stack grow. In cross-compiled environments these fallback to the default values which are not always correct (our vsprintf() is fine, but the test assumes it isn't) so set these properties explicitly. Ideally this happens magically by meson.bbclass using the same logic as siteinfo.bbclass, but we need to fix glib now. (From OE-Core rev: e04e0a20cab04966698c50dc79195a8f159248d3) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0/glib-meson.cross6
-rw-r--r--meta/recipes-core/glib-2.0/glib-2.0_2.58.3.bb1
-rw-r--r--meta/recipes-core/glib-2.0/glib.inc1
3 files changed, 8 insertions, 0 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/glib-meson.cross b/meta/recipes-core/glib-2.0/glib-2.0/glib-meson.cross
new file mode 100644
index 0000000000..8420f9874e
--- /dev/null
+++ b/meta/recipes-core/glib-2.0/glib-2.0/glib-meson.cross
@@ -0,0 +1,6 @@
1[properties]
2have_c99_vsnprintf = true
3have_c99_snprintf = true
4have_unix98_printf = true
5va_val_copy = true
6growing_stack = false
diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.58.3.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.58.3.bb
index 2de2affa51..c872c74920 100644
--- a/meta/recipes-core/glib-2.0/glib-2.0_2.58.3.bb
+++ b/meta/recipes-core/glib-2.0/glib-2.0_2.58.3.bb
@@ -16,6 +16,7 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
16 file://0001-Set-host_machine-correctly-when-building-with-mingw3.patch \ 16 file://0001-Set-host_machine-correctly-when-building-with-mingw3.patch \
17 file://0001-Do-not-write-bindir-into-pkg-config-files.patch \ 17 file://0001-Do-not-write-bindir-into-pkg-config-files.patch \
18 file://0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch \ 18 file://0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch \
19 file://glib-meson.cross \
19 " 20 "
20 21
21SRC_URI_append_class-native = " file://relocate-modules.patch" 22SRC_URI_append_class-native = " file://relocate-modules.patch"
diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 6f0ec1ad2e..574bb38557 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -53,6 +53,7 @@ PACKAGECONFIG[libelf] = ",,elfutils"
53PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false,dbus" 53PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false,dbus"
54 54
55EXTRA_OEMESON = "-Ddtrace=false -Dfam=false -Dsystemtap=false -Dselinux=false" 55EXTRA_OEMESON = "-Ddtrace=false -Dfam=false -Dsystemtap=false -Dselinux=false"
56EXTRA_OEMESON_append_class-target = " --cross-file ${WORKDIR}/glib-meson.cross"
56 57
57do_configure_prepend() { 58do_configure_prepend() {
58 sed -i -e '1s,#!.*,#!${USRBINPATH}/env python3,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in 59 sed -i -e '1s,#!.*,#!${USRBINPATH}/env python3,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in