Mercurial > mxe-octave
changeset 710:c4511cb534fc
build the native glib-genmarshal tool without libiconv support
author | Volker Grabsch <vog@notjusthosting.com> |
---|---|
date | Sun, 07 Feb 2010 17:15:17 +0100 |
parents | c4cadd2331de |
children | 2df4c31498ae |
files | src/glib.mk |
diffstat | 1 files changed, 1 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/glib.mk Sun Feb 07 16:43:54 2010 +0100 +++ b/src/glib.mk Sun Feb 07 17:15:17 2010 +0100 @@ -21,14 +21,6 @@ endef define $(PKG)_BUILD - # native build of libiconv (used by glib-genmarshal) - cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,libiconv) - cd '$(1)/$(libiconv_SUBDIR)' && ./configure \ - --prefix='$(1)/libiconv' \ - --disable-shared \ - --disable-nls - $(MAKE) -C '$(1)/$(libiconv_SUBDIR)' -j 1 install - # native build for glib-genmarshal, without pkg-config, gettext and zlib cd '$(1)' && $(call UNPACK_PKG_ARCHIVE,glib) $(SED) 's,^PKG_CONFIG=.*,PKG_CONFIG=echo,' -i '$(1)/$(glib_SUBDIR)/configure' @@ -44,9 +36,7 @@ --disable-selinux \ --disable-fam \ --disable-xattr \ - --with-libiconv=gnu \ - CPPFLAGS='-I$(1)/libiconv/include' \ - LDFLAGS='-L$(1)/libiconv/lib' + --without-libiconv $(SED) 's,#define G_ATOMIC.*,,' -i '$(1)/$(glib_SUBDIR)/config.h' $(MAKE) -C '$(1)/$(glib_SUBDIR)/glib' -j '$(JOBS)' $(MAKE) -C '$(1)/$(glib_SUBDIR)/gthread' -j '$(JOBS)'