diff options
| author | Vincent Sanders <vince@kyllikki.org> | 2013-11-24 16:40:20 +0000 |
|---|---|---|
| committer | Vincent Sanders <vince@kyllikki.org> | 2013-11-24 16:40:20 +0000 |
| commit | 010abeda3f9cf3f49e566e11b905fc141b57f201 (patch) | |
| tree | 64bea9f8aa56b44fddaf994e126723c2df41f85a | |
| parent | 99d3b803a9df5a982e61d665596900f66130603c (diff) | |
| download | toolchains-010abeda3f9cf3f49e566e11b905fc141b57f201.tar.gz toolchains-010abeda3f9cf3f49e566e11b905fc141b57f201.tar.bz2 | |
deal with zlib removing bz2
| -rw-r--r-- | sdk/Makefile | 14 | ||||
| -rwxr-xr-x | sdk/fetchsrc | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sdk/Makefile b/sdk/Makefile index 20f38ec..1da08d7 100644 --- a/sdk/Makefile +++ b/sdk/Makefile @@ -152,20 +152,20 @@ $(BUILDSTEPS)/builddir.d: # zlib $(BUILDSTEPS)/zlib.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib-src.d + cd $(BUILDDIR)/zlib/zlib-$(VERSION_ZLIB) && $(env) ./configure --prefix=$(GCCSDK_INSTALL_ENV) --static + cd $(BUILDDIR)/zlib/zlib-$(VERSION_ZLIB) && $(env) make install + touch $@ + +$(BUILDSTEPS)/zlib-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/zlib-$(VERSION_ZLIB).tar.gz mkdir -p $(BUILDDIR)/zlib - cd $(BUILDDIR)/zlib && tar xjf $(SOURCEDIR)/zlib-$(VERSION_ZLIB).tar.bz2 + cd $(BUILDDIR)/zlib && tar xjf $(SOURCEDIR)/zlib-$(VERSION_ZLIB).tar.gz for p in `ls $(RECIPES)/patches/zlib/*.p` ; do patch -d $(BUILDDIR)/zlib/zlib-$(VERSION_ZLIB) -p0 <$$p ; done 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 $@ - -$(BUILDSTEPS)/zlib-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/zlib-$(VERSION_ZLIB).tar.bz2 touch $@ -$(SOURCEDIR)/zlib-$(VERSION_ZLIB).tar.bz2: +$(SOURCEDIR)/zlib-$(VERSION_ZLIB).tar.gz: $(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://zlib.net/$(subst $(SOURCEDIR)/,,$@)" $@ # libiconv diff --git a/sdk/fetchsrc b/sdk/fetchsrc index 1c03a92..46b72b0 100755 --- a/sdk/fetchsrc +++ b/sdk/fetchsrc @@ -13,6 +13,6 @@ if [ $? -ne 0 ];then wget -q -O ${4} ${3} if [ $? -ne 0 ];then rm ${4} - return 1 + exit 1 fi fi |