Re: [PATCH] fix cross compilation in glib-2.25.7

[Ryan Lortie <desrt desrt ca>]

hi Robert

I'm in transit, so I don't have a good chance to look at this now.

In general, we try to track patches via bugzilla, though.  It's
definitely appropriate to open an issue there.  I will try to understand
it when I am on solid ground again.

Cheers

On Mon, 2010-05-31 at 18:09 +0200, Robert Schwebel wrote:
> Ryan,
> 
> Any chance to merge the patch below for the next release?
> 
> Do you prefer adding patches like this one to the bugtracker, or is it
> ok to send it to gtk-devel-list?
> 
> rsc
> 
> On Wed, May 26, 2010 at 07:41:28PM +0200, Robert Schwebel wrote:
> > Ryan,
> > 
> > On Mon, May 24, 2010 at 11:09:15PM -0400, Ryan Lortie wrote:
> > > GLib 2.25.7 is now available [...]
> > 
> > I've tried to cross compile glib-2.25.7, and it crashes in gio/tests,
> > because compiles glib-compile-schemas for the "host" system, but tries
> > to run it later on the "build" machine.
> > 
> > The patch below makes it possible to overwrite the call to
> > glib-compile-schemas in the cross case, similar to what GLIB_GENMARSHAL
> > does.
> > 
> > Signed-of-by: Robert Schwebel <r schwebel pengutronix de>
> > 
> > ---
> >  configure.in          |   13 ++++++++++---
> >  gio/tests/Makefile.am |    2 +-
> >  2 files changed, 11 insertions(+), 4 deletions(-)
> > 
> > Index: glib-2.25.7/configure.in
> > ===================================================================
> > --- glib-2.25.7.orig/configure.in
> > +++ glib-2.25.7/configure.in
> > @@ -2731,9 +2731,10 @@ int error = EILSEQ;
> >  ], have_eilseq=yes, have_eilseq=no);
> >  AC_MSG_RESULT($have_eilseq)
> >  
> > -dnl ******************************************************************
> > -dnl *** Look for glib-genmarshal in PATH if we are cross-compiling ***
> > -dnl ******************************************************************
> > +dnl ****************************************************************
> > +dnl *** Look for glib-genmarshal and glib-compile-schemas in PATH **
> > +dnl *** if we are cross-compiling                                 **
> > +dnl ****************************************************************
> >  
> >  AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
> >  
> > @@ -2742,6 +2743,12 @@ if test $cross_compiling = yes; then
> >    if test x$GLIB_GENMARSHAL = xno; then
> >      AC_MSG_ERROR(Could not find a glib-genmarshal in your PATH)
> >    fi
> > +  AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas, no)
> > +  if test x$GLIB_COMPILE_SCHEMAS = xno; then
> > +    AC_MSG_ERROR(Could not find a glib-compile-schemas in your PATH)
> > +  fi
> > +else
> > +  AC_SUBST(GLIB_COMPILE_SCHEMAS,"\$(top_builddir)/gio/glib-compile-schemas")
> >  fi
> >  
> >  dnl **************************
> > Index: glib-2.25.7/gio/tests/Makefile.am
> > ===================================================================
> > --- glib-2.25.7.orig/gio/tests/Makefile.am
> > +++ glib-2.25.7/gio/tests/Makefile.am
> > @@ -288,7 +288,7 @@ test.mo: de.po
> >  	cp -f test.mo de/LC_MESSAGES
> >  
> >  gschemas.compiled:
> > -	$(top_builddir)/gio/glib-compile-schemas --targetdir=$(abs_builddir) $(srcdir)
> > +	$(GLIB_COMPILE_SCHEMAS) --targetdir=$(abs_builddir) $(srcdir)
> >  
> >  DISTCLEANFILES =                                        \
> >  	applications/mimeinfo.cache                     \
> > 
> > -- 
> > Pengutronix e.K.                           |                             |
> > Industrial Linux Solutions                 | http://www.pengutronix.de/  |
> > Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
> > Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
> > _______________________________________________
> > gtk-devel-list mailing list
> > gtk-devel-list gnome org
> > http://mail.gnome.org/mailman/listinfo/gtk-devel-list
> > 
>