# HG changeset patch # User Volker Grabsch # Date 1265342729 -3600 # Node ID a6958c580debd561f428810e162eb5596380dbc6 # Parent 0964ad16d896dd8912c928958c54e2be4bd12d90 don't require a native zlib-devel when building package glib (by Tony Theodore) diff -r 0964ad16d896 -r a6958c580deb src/glib.mk --- a/src/glib.mk Fri Feb 05 04:38:03 2010 +0100 +++ b/src/glib.mk Fri Feb 05 05:05:29 2010 +0100 @@ -29,11 +29,13 @@ --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)' \