diff options
| author | Volker Grabsch <vog@notjusthosting.com> | 2010-02-11 22:55:39 (GMT) |
|---|---|---|
| committer | Volker Grabsch <vog@notjusthosting.com> | 2010-02-11 22:55:39 (GMT) |
| commit | 68899a035b8c2d4b90b28d49960d0e945bda3e77 (patch) | |
| tree | d45675dc95b528eebae6ae35a43454a1cb80e986 /src | |
| parent | 0557ac94e60517c7280b5d3c41fbcea07188c6df (diff) | |
| download | mxe-68899a035b8c2d4b90b28d49960d0e945bda3e77.zip mxe-68899a035b8c2d4b90b28d49960d0e945bda3e77.tar.gz mxe-68899a035b8c2d4b90b28d49960d0e945bda3e77.tar.bz2 | |
ensure that the native glib-genmarshal build with libiconv always succeeds
Diffstat (limited to 'src')
| -rw-r--r-- | src/glib.mk | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/glib.mk b/src/glib.mk index 33bb233..bf06f4e 100644 --- a/src/glib.mk +++ b/src/glib.mk @@ -21,9 +21,17 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD - # native build for glib-genmarshal, without pkg-config, gettext and zlib cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,glib) mv '$(1)/$(glib_SUBDIR)' '$(1).native' + + # native build of libiconv (used by glib-genmarshal) + cd '$(1).native' && $(call UNPACK_PKG_ARCHIVE,libiconv) + cd '$(1).native/$(libiconv_SUBDIR)' && ./configure \ + --disable-shared \ + --disable-nls + $(MAKE) -C '$(1).native/$(libiconv_SUBDIR)' -j '$(JOBS)' + + # native build for glib-genmarshal, without pkg-config, gettext and zlib $(SED) 's,gt_cv_have_gettext=yes,gt_cv_have_gettext=no,' -i '$(1).native/configure' $(SED) '/You must.*have gettext/,/exit 1;/ s,.*exit 1;.*,},' -i '$(1).native/configure' $(SED) 's,found_zlib=no,found_zlib=yes,' -i '$(1).native/configure' @@ -34,7 +42,10 @@ define $(PKG)_BUILD --disable-threads \ --disable-selinux \ --disable-fam \ - --disable-xattr + --disable-xattr \ + --with-libiconv=gnu \ + CPPFLAGS='-I$(1).native/$(libiconv_SUBDIR)/include' \ + LDFLAGS='-L$(1).native/$(libiconv_SUBDIR)/lib/.libs' $(SED) 's,#define G_ATOMIC.*,,' -i '$(1).native/config.h' $(MAKE) -C '$(1).native/glib' -j '$(JOBS)' $(MAKE) -C '$(1).native/gthread' -j '$(JOBS)' |