[ITP-2] glib-2.4.2-1

[Gerrit P. Haase]

Dr. schrieb:

>>>>>> Gerrit P Haase writes:

>     > Hello,
>     > I want to contribute/maintain glib.
>     > Canonical website: http://www.gtk.org/

> Hi Gerrit, during the build stage I get the following error:

> make[3]: Leaving directory `/usr/src/glib-2.4.2/.build/gobject'
> echo "#ifndef __G_MARSHAL_H__" > xgen-gmh \
> && echo "#define __G_MARSHAL_H__" >> xgen-gmh \
> && ./.libs/glib-genmarshal --nostdinc --prefix=g_cclosure_marshal
> /usr/src/glib-2.4.2/gobject/gmarshal.list --header >> xgen-gmh \
> && echo "#endif /* __G_MARSHAL_H__ */" >> xgen-gmh \
> && (cmp -s xgen-gmh gmarshal.h 2>/dev/null || cp xgen-gmh gmarshal.h) \
> && rm -f xgen-gmh xgen-gmh~ \
> && echo timestamp > stamp-gmarshal.h


> Here a windows popup box appears with glib-genmarshal.exe - Unable To
> Locate DLL

> The dynamic link library cygglib-2.0-0.dll could not be found in the
> specified path.


Hmmm, yes, it is weird.  They link against the new library, didn't
notice this because I have cygglib-2.0-0.dll already installed, though
it is an older version.  We should use the static glib library if there
is one, if not, then it could be enabled and then use it to link
glib-genmarshal against it.

Could you try this, please:

diff -ud glib-2.4.2-1.sh~ glib-2.4.2-1.sh
--- glib-2.4.2-1.sh~    2004-06-16 10:03:02.644065600 +0200
+++ glib-2.4.2-1.sh     2004-06-16 10:03:02.784267200 +0200
@@ -149,7 +149,8 @@
   --libdir=${prefix}/lib --includedir=${prefix}/include \
   --mandir=${prefix}/share/man --infodir=${prefix}/share/info \
   --libexecdir='${sbindir}' --localstatedir=/var \
-  --datadir='${prefix}/share' --enable-gtk-doc )
+  --datadir='${prefix}/share' --enable-gtk-doc \
+  --enable-static )
 }
 reconf() {
   (cd ${topdir} && \

diff -ud glib-2.4.2/gobject/Makefile.am~ glib-2.4.2/gobject/Makefile.am
--- glib-2.4.2/gobject/Makefile.am~     2004-06-16 10:07:31.381532800 +0200
+++ glib-2.4.2/gobject/Makefile.am      2004-06-16 10:07:24.341409600 +0200
@@ -185,6 +185,7 @@
 # link programs against libgobject
 progs_LDADD = ./libgobject-2.0.la $(libglib)
 glib_genmarshal_LDADD = $(libglib)
+glib_genmarshal_LDFLAGS = -static
 gobject_query_LDADD = $(progs_LDADD)
 testgobject_LDADD = $(progs_LDADD)
 

diff -ud glib-2.4.2/gobject/Makefile.in~ glib-2.4.2/gobject/Makefile.in
--- glib-2.4.2/gobject/Makefile.in~     2004-06-16 10:08:09.676598400 +0200
+++ glib-2.4.2/gobject/Makefile.in      2004-06-16 10:08:41.973038400 +0200
@@ -401,7 +401,7 @@
 am_glib_genmarshal_OBJECTS = glib-genmarshal.$(OBJEXT)
 glib_genmarshal_OBJECTS = $(am_glib_genmarshal_OBJECTS)
 glib_genmarshal_DEPENDENCIES = $(top_builddir)/glib/libglib-2.0.la
-glib_genmarshal_LDFLAGS =
+glib_genmarshal_LDFLAGS = -static
 am_gobject_query_OBJECTS = gobject-query.$(OBJEXT)
 gobject_query_OBJECTS = $(am_gobject_query_OBJECTS)
 gobject_query_DEPENDENCIES = ./libgobject-2.0.la \




Gerrit
-- 
=^..^=