diff options
| author | Tobias Gruetzmacher <tobias-git@23.gs> | 2015-02-02 21:46:13 (GMT) |
|---|---|---|
| committer | Tobias Gruetzmacher <tobias-git@23.gs> | 2015-02-05 18:56:32 (GMT) |
| commit | 7680835ae2405215249ac1e26cebd155538cb769 (patch) | |
| tree | 19fe10e5b43b6c64cf7b96092aab891296f8043e /src | |
| parent | 614062a4e0241ef47ba08f37790fe692d900be16 (diff) | |
| download | mxe-7680835ae2405215249ac1e26cebd155538cb769.zip mxe-7680835ae2405215249ac1e26cebd155538cb769.tar.gz mxe-7680835ae2405215249ac1e26cebd155538cb769.tar.bz2 | |
glib: Build native zlib for tools.
Newer versions of glib require zlib, so the build fails if zlib (&
development headers) aren't installed in the host system...
Diffstat (limited to 'src')
| -rw-r--r-- | src/glib.mk | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/glib.mk b/src/glib.mk index a4c3cb7..522c365 100644 --- a/src/glib.mk +++ b/src/glib.mk @@ -29,7 +29,13 @@ define $(PKG)_NATIVE_BUILD --disable-nls $(MAKE) -C '$(1).native/$(libiconv_SUBDIR)' -j '$(JOBS)' - # native build for glib-genmarshal, without gettext and zlib + # native build of zlib... + cd '$(1).native' && $(call UNPACK_PKG_ARCHIVE,zlib) + cd '$(1).native/$(zlib_SUBDIR)' && ./configure \ + --static + $(MAKE) -C '$(1).native/$(zlib_SUBDIR)' -j '$(JOBS)' + + # native build for glib-genmarshal, without gettext cd '$(1).native' && ./configure \ --disable-shared \ --prefix='$(PREFIX)/$(TARGET)' \ @@ -42,8 +48,8 @@ define $(PKG)_NATIVE_BUILD --disable-dtrace \ --with-libiconv=gnu \ --with-pcre=internal \ - CPPFLAGS='-I$(1).native/$(libiconv_SUBDIR)/include' \ - LDFLAGS='-L$(1).native/$(libiconv_SUBDIR)/lib/.libs' + CPPFLAGS='-I$(1).native/$(libiconv_SUBDIR)/include -I$(1).native/$(zlib_SUBDIR)' \ + LDFLAGS='-L$(1).native/$(libiconv_SUBDIR)/lib/.libs -L$(1).native/$(zlib_SUBDIR)' $(SED) -i 's,#define G_ATOMIC.*,,' '$(1).native/config.h' $(MAKE) -C '$(1).native/glib' -j '$(JOBS)' $(MAKE) -C '$(1).native/gthread' -j '$(JOBS)' |