Re: revised patch for glib compilation on cygwin with POSIX runtime

[Owen Taylor <otaylor redhat com>]

Stefan Ondrejicka <ondrej idata sk> writes:

> Hello Tor,
> 
> I have bit corrected the patch I sent you yesterday. There was quite
> broken compilation of gobject library. Now it works properly. The attached
> diff is made again glib cvs chackout from janury 29. I will appreciate any
> commenets.

> +This file expain a bit way how to compile glib package on cygwin for
> +use *with* cygwin POSIX runtime.
> +  As the libtool package is not able build without problems DLLs on
> +win32 there is need for compilation method which differ a bit from
> +standard compilation on UNIX platforms.

I believe that CVS versions of libtool provide support for Win32 DLLs.

Instead of continuing to creating yet more hand-built Makefiles (and I
suspect that Tor finds two sets already a big pain to keep up to
date), I think I'd rather have users on Cygwin to re-libtoolize with a
CVS snapshot until we can update the libtool shipped with libtool to a
version with this feature.

We really need features from newer libtool for BeOS and AIX anyways,
and it would even be conceivably possible to switch GLib/GTK+-1.3.x
to CVS libtool.

> diff -ruN glib-cvs29012001/cygglib.def glib/cygglib.def
> --- glib-cvs29012001/cygglib.def	Thu Jan  1 01:00:00 1970
> +++ glib/cygglib.def	Mon Feb  5 13:33:46 2001

Errr, why does cygwin need a separate defs file? (Tor can _definitely_
tell you that maintaining the ones we have already is a pain.)

Can we either;

 - Just use that
 - Generate the cygwin defs files from that by some sort sed script.

> diff -ruN glib-cvs29012001/gconvert.c glib/gconvert.c
> --- glib-cvs29012001/gconvert.c	Mon Jan 29 11:24:13 2001
> +++ glib/gconvert.c	Sun Feb  4 21:20:46 2001
> @@ -28,7 +28,7 @@
>  #include "glib.h"
>  #include "config.h"
>  
> -#ifdef G_OS_WIN32
> +#if defined(G_OS_WIN32) || defined(G_WITH_CYGWIN)

OK, this is a problem that you have this all over the place. The reason
that G_OS_WIN32 is _not_ defined for cygwin was that it was considered
that CYGWIN should be G_OS_UNIX + G_WITH_CYGWIN since it would be
more like Unix than like Win32. 

There are two things we can do:

 1) We could define G_OS_WIN32 for cygwin; this would be a good idea
    only if that didn't produce a lot of:
   
     #if defined (G_OS_WIN32) || defined (G_WITH_CYGWIN)

 2) We could make another #define that applies to both Cygwin and Win32,
    say, G_WIN32_PLATFORM.


> diff -ruN glib-cvs29012001/gfileutils.c glib/gfileutils.c
> --- glib-cvs29012001/gfileutils.c	Mon Jan 29 11:24:14 2001
> +++ glib/gfileutils.c	Sun Feb  4 21:20:46 2001
> @@ -378,7 +378,7 @@
>    struct stat stat_buf;
>    gint fd;
>    
> -  fd = open (filename, O_RDONLY);
> +  fd = open (filename, O_RDONLY | O_BINARY);

Sigh. Having read() do line-end translation is one of the most 
screwed up things....

Maybe we should define a G_O_BINARY, since O_BINARY isn't portable.
(Though this file has #define, this comes up over and over again :-()

Regards,
                                        Owen