luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-08-20 07:38:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'cross' into 'master'

Browse Source 
Autotools: Always run glib-genmarshal, even if cross-compiling

Closes #1546

See merge request GNOME/glib!362
This commit is contained in:
Emmanuele Bassi
2018-09-26 21:16:17 +00:00
parent a5e900c329 129512b67c
commit b71d7e4b33
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/gobject/Makefile.am
View File

@@ -51,24 +51,20 @@ if ENABLE_TIMELOOP
installed_test_programs += timeloop-closure installed_test_programs += timeloop-closure
endif 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 glib_genmarshal=$(top_builddir)/gobject/glib-genmarshal
testmarshal.h: stamp-testmarshal.h testmarshal.h: stamp-testmarshal.h
@true @true
stamp-testmarshal.h: testmarshal.list $(glib_genmarshal) 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) \ && (cmp -s xgen-gmh testmarshal.h 2>/dev/null || cp xgen-gmh testmarshal.h) \
&& rm -f xgen-gmh xgen-gmh~ \ && rm -f xgen-gmh xgen-gmh~ \
&& echo timestamp > $@ && echo timestamp > $@
testmarshal.c: testmarshal.h testmarshal.list $(glib_genmarshal) 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 \ && cp xgen-gmc testmarshal.c \
&& rm -f xgen-gmc xgen-gmc~ && rm -f xgen-gmc xgen-gmc~
BUILT_SOURCES += testmarshal.h testmarshal.c BUILT_SOURCES += testmarshal.h testmarshal.c
CLEANFILES += stamp-testmarshal.h testmarshal.h testmarshal.c CLEANFILES += stamp-testmarshal.h testmarshal.h testmarshal.c
EXTRA_DIST += testcommon.h testmarshal.list EXTRA_DIST += testcommon.h testmarshal.list
endif # !CROSS_COMPILING