diff options
| author | Volker Grabsch <vog@notjusthosting.com> | 2010-02-07 16:15:17 (GMT) |
|---|---|---|
| committer | Volker Grabsch <vog@notjusthosting.com> | 2010-02-07 16:15:17 (GMT) |
| commit | 04b7e7d8302bb8b01546d3349d60df02a55d2311 (patch) | |
| tree | fc7dc4887345a16ef1874cb5be64fe7d78852d84 /src/glib.mk | |
| parent | 6661754361b6cd7c48bdfa00e1434ab4d0fa6957 (diff) | |
| download | mxe-04b7e7d8302bb8b01546d3349d60df02a55d2311.zip mxe-04b7e7d8302bb8b01546d3349d60df02a55d2311.tar.gz mxe-04b7e7d8302bb8b01546d3349d60df02a55d2311.tar.bz2 | |
build the native glib-genmarshal tool without libiconv support
Diffstat (limited to 'src/glib.mk')
| -rw-r--r-- | src/glib.mk | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/src/glib.mk b/src/glib.mk index 8d8cebc..04eda81 100644 --- a/src/glib.mk +++ b/src/glib.mk @@ -21,14 +21,6 @@ define $(PKG)_UPDATE 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 @@ define $(PKG)_BUILD --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)' |