[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Mingw-cross-env-list] [PATCH cleanup] upgrade packages glib gtk

From: Mark Brand
Subject: Re: [Mingw-cross-env-list] [PATCH cleanup] upgrade packages glib gtk
Date: Tue, 27 Apr 2010 21:04:08 +0200
User-agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv: Gecko/20100308 SUSE/3.1b1-6.3 Thunderbird/3.1b1

Thanks, I tried that and made a few changes - install iconv to
.native/usr, remove SHELL=bash and change *FLAGS. Joy, it builds and
the test exe works!

On OSX at least; unfortunately, Ubuntu (and Debian Squeeze) are
failing as attached.

It looks like we are very close to getting this to work.

I have an idea about Ubuntu and Debian. These probably have a libintl.h already. The glib/gio sources sometimes have both #include <glibintl.h> and #include "glibintl.h". This could cause the libintl.h from our gettext to be used in some cases and the "real" one in others. I think we can work around this by changing the "-I" to "-isystem" so our "usr/include" is treated like a system include directory. I made a new version of the patch that does this.

Would  you like to try this again?

diff -r c4858c86408f src/glib.mk
--- a/src/glib.mk       Tue Apr 27 12:33:40 2010 +0200
+++ b/src/glib.mk       Tue Apr 27 21:01:10 2010 +0200
@@ -28,9 +28,19 @@
     # native build of libiconv (used by glib-genmarshal)
     cd '$(1).native' && $(call UNPACK_PKG_ARCHIVE,libiconv)
     cd '$(1).native/$(libiconv_SUBDIR)' && ./configure \
+        --prefix='$(1).native/usr' \
         --disable-shared \
-    $(MAKE) -C '$(1).native/$(libiconv_SUBDIR)' -j '$(JOBS)'
+    $(MAKE) -C '$(1).native/$(libiconv_SUBDIR)' -j '$(JOBS)' install
+    # native build of gettext (used by glib-compile-schemas)
+    # darwin and freebsd might lack libintl.h otherwise
+    cd '$(1).native' && $(call UNPACK_PKG_ARCHIVE,gettext)
+    cd '$(1).native/$(gettext_SUBDIR)/gettext-runtime' && ./configure \
+        --prefix='$(1).native/usr' \
+        --disable-shared \
+        --with-included-gettext
+ $(MAKE) -C '$(1).native/$(gettext_SUBDIR)/gettext-runtime/intl' -j '$(JOBS)' install

# native build for glib-genmarshal, without pkg-config, gettext and zlib
     cd '$(1).native' && ./configure \
@@ -42,8 +52,8 @@
         --disable-fam \
         --disable-xattr \
         --with-libiconv=gnu \
-        CPPFLAGS='-I$(1).native/$(libiconv_SUBDIR)/include' \
-        LDFLAGS='-L$(1).native/$(libiconv_SUBDIR)/lib/.libs'
+        CPPFLAGS='-isystem $(1).native/usr/include' \
+        LDFLAGS='-L$(1).native/usr/lib'
     $(SED) -i 's,#define G_ATOMIC.*,,' '$(1).native/config.h'
     $(MAKE) -C '$(1).native/glib'    -j '$(JOBS)'
     $(MAKE) -C '$(1).native/gthread' -j '$(JOBS)'

reply via email to

[Prev in Thread] Current Thread [Next in Thread]