[glib/glib-2-58: 51/55] Autotools: Always run glib-genmarshal, even if cross-compiling

[Xavier Claessens <xclaesse src gnome org>]

commit c9f5eefa105b7e6f44f30ecc084d59b569c3dd2f
Author: Simon McVittie <smcv collabora com>
Date:   Wed Sep 26 13:45:30 2018 +0100

    Autotools: Always run glib-genmarshal, even if cross-compiling
    
    glib-genmarshal is now written in Python rather than C, so we can
    always run it directly, even if we're cross-compiling for an
    architecture whose binaries we can't run. This matches the behaviour
    of the Meson build system.
    
    Fixes: https://gitlab.gnome.org/GNOME/glib/issues/1546
    Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=908334
    Signed-off-by: Simon McVittie <smcv collabora com>

 tests/gobject/Makefile.am | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)
---
diff --git a/tests/gobject/Makefile.am b/tests/gobject/Makefile.am
index 0e609870b..1bcefbe5c 100644
--- a/tests/gobject/Makefile.am
+++ b/tests/gobject/Makefile.am
@@ -51,24 +51,20 @@ if ENABLE_TIMELOOP
 installed_test_programs += timeloop-closure
 endif
 
-# The marshal test requires running a binary, which means we cannot
-# build it when cross-compiling
-if !CROSS_COMPILING
 glib_genmarshal=$(top_builddir)/gobject/glib-genmarshal
 
 testmarshal.h: stamp-testmarshal.h
        @true
 stamp-testmarshal.h: testmarshal.list $(glib_genmarshal)
-       $(AM_V_GEN) $(glib_genmarshal) --prefix=test_marshal $(srcdir)/testmarshal.list --header >> xgen-gmh \
+       $(AM_V_GEN) $(PYTHON) $(glib_genmarshal) --prefix=test_marshal $(srcdir)/testmarshal.list --header >> 
xgen-gmh \
        && (cmp -s xgen-gmh testmarshal.h 2>/dev/null || cp xgen-gmh testmarshal.h) \
        && rm -f xgen-gmh xgen-gmh~ \
        && echo timestamp > $@
 testmarshal.c: testmarshal.h testmarshal.list $(glib_genmarshal)
-       $(AM_V_GEN) (echo "#include \"testmarshal.h\""; $(glib_genmarshal) --prefix=test_marshal 
$(srcdir)/testmarshal.list --body) >> xgen-gmc \
+       $(AM_V_GEN) (echo "#include \"testmarshal.h\""; $(PYTHON) $(glib_genmarshal) --prefix=test_marshal 
$(srcdir)/testmarshal.list --body) >> xgen-gmc \
        && cp xgen-gmc testmarshal.c \
        && rm -f xgen-gmc xgen-gmc~
 
 BUILT_SOURCES += testmarshal.h testmarshal.c
 CLEANFILES += stamp-testmarshal.h testmarshal.h testmarshal.c
 EXTRA_DIST += testcommon.h testmarshal.list
-endif # !CROSS_COMPILING
\ No newline at end of file