diff options
author | John Mark Bell <jmb@netsurf-browser.org> | 2011-01-02 21:32:48 +0000 |
---|---|---|
committer | John Mark Bell <jmb@netsurf-browser.org> | 2011-01-02 21:32:48 +0000 |
commit | 46383ca6f41e7d69a7100f83faa7d75172f1766c (patch) | |
tree | caf2f960271b4a9ba07d4e5c0398c531735798e9 /sdk/Makefile | |
parent | e93658a33b15e53413f32f78c355a7998131aa49 (diff) | |
download | toolchains-46383ca6f41e7d69a7100f83faa7d75172f1766c.tar.gz toolchains-46383ca6f41e7d69a7100f83faa7d75172f1766c.tar.bz2 |
Extra patches for zlib to avoid ugly warnings caused by the use of undefined preprocessor macros
RISC OS-specific patch for zlib to stop it erroneously detecting largefile64 support where there is none
Ensure we build zlib static and not shared
svn path=/toolchains/; revision=11182
Diffstat (limited to 'sdk/Makefile')
-rw-r--r-- | sdk/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sdk/Makefile b/sdk/Makefile index 3752e92..73a6cad 100644 --- a/sdk/Makefile +++ b/sdk/Makefile @@ -93,7 +93,10 @@ $(BUILDSTEPS)/zlib.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib-src.d mkdir -p $(BUILDDIR)/zlib cd $(BUILDDIR)/zlib && tar xjf $(SOURCEDIR)/zlib-$(VERSION_ZLIB).tar.bz2 for p in `ls $(RECIPES)/patches/zlib/*.p` ; do patch -d $(BUILDDIR)/zlib/zlib-$(VERSION_ZLIB) -p0 <$$p ; done - cd $(BUILDDIR)/zlib/zlib-$(VERSION_ZLIB) && $(env) ./configure --prefix=$(GCCSDK_INSTALL_ENV) +ifneq ($(realpath $(RECIPES)/patches/zlib/$(TARGET)),) + for p in `ls $(RECIPES)/patches/zlib/$(TARGET)/*.p` ; do patch -d $(BUILDDIR)/zlib/zlib-$(VERSION_ZLIB) -p0 <$$p ; done +endif + cd $(BUILDDIR)/zlib/zlib-$(VERSION_ZLIB) && $(env) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --static cd $(BUILDDIR)/zlib/zlib-$(VERSION_ZLIB) && $(env) make install touch $@ |