summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorVolker Grabsch <vog@notjusthosting.com>2010-02-05 04:05:29 (GMT)
committerVolker Grabsch <vog@notjusthosting.com>2010-02-05 04:05:29 (GMT)
commit8cc4cc0c41a4a05248a5c62cc9c47f06f98b0492 (patch)
tree8e0f185ec88724a7507bf0b4c310dc3028714429 /src
parent2e22314817e987e15e3740acb3f165bcd221daf1 (diff)
downloadmxe-8cc4cc0c41a4a05248a5c62cc9c47f06f98b0492.zip
mxe-8cc4cc0c41a4a05248a5c62cc9c47f06f98b0492.tar.gz
mxe-8cc4cc0c41a4a05248a5c62cc9c47f06f98b0492.tar.bz2
don't require a native zlib-devel when building package glib (by Tony Theodore)
Diffstat (limited to 'src')
-rw-r--r--src/glib.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/glib.mk b/src/glib.mk
index 0346e40..022d17a 100644
--- a/src/glib.mk
+++ b/src/glib.mk
@@ -29,11 +29,13 @@ define $(PKG)_BUILD
--disable-nls
$(MAKE) -C '$(1)/$(libiconv_SUBDIR)' -j 1 install
- # native build for glib-genmarshal, without pkg-config and gettext
+ # 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'
$(SED) 's,gt_cv_have_gettext=yes,gt_cv_have_gettext=no,' -i '$(1)/$(glib_SUBDIR)/configure'
$(SED) '/You must.*have gettext/,/exit 1;/ s,.*exit 1;.*,},' -i '$(1)/$(glib_SUBDIR)/configure'
+ $(SED) 's,found_zlib=no,found_zlib=yes,' -i '$(1)/$(glib_SUBDIR)/configure'
+
cd '$(1)/$(glib_SUBDIR)' && ./configure \
--disable-shared \
--prefix='$(PREFIX)' \