From 05c9fb5a026e3006a1fc037f957cb4341fb55030 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 18 Jun 2019 16:12:29 +0100 Subject: glib-2.0: fix host path appearing in gsocketclient-slow test script Glib's build looks for the 'env' binary and embeds that path into the test script, but thanks to hosttools this is /path/to/tmpdir/hosttools/env. Fix this by hardcoding the path to env in the cross file. Also as the cross file is only used in target builds only add it to SRC_URI for target builds, so that changes to the cross file don't cause a rebuild of glib-2.0-native. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-core/glib-2.0/glib-2.0/glib-meson.cross | 3 +++ meta/recipes-core/glib-2.0/glib-2.0_2.60.3.bb | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) 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 index 8420f9874e..b5df400727 100644 --- 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 @@ -4,3 +4,6 @@ have_c99_snprintf = true have_unix98_printf = true va_val_copy = true growing_stack = false + +[binaries] +env = "/usr/bin/env" diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.60.3.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.60.3.bb index f4ade098ef..bb77294e1e 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.60.3.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.60.3.bb @@ -16,10 +16,10 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://0001-Do-not-write-bindir-into-pkg-config-files.patch \ file://0001-meson.build-do-not-hardcode-linux-as-the-host-system.patch \ file://0001-meson-do-a-build-time-check-for-strlcpy-before-attem.patch \ - file://glib-meson.cross \ " SRC_URI_append_class-native = " file://relocate-modules.patch" +SRC_URI_append_class-target = " file://glib-meson.cross" SRC_URI[md5sum] = "112a850caa8d2c21e24d4c9844e8b1fe" SRC_URI[sha256sum] = "04ab0d560d45790d055f50db2d69974eab8b693a77390075462c56e652b760b9" -- cgit 1.2.3-korg