summaryrefslogtreecommitdiff
path: root/sdk/Makefile
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2019-02-15 10:50:07 +0000
committerVincent Sanders <vince@kyllikki.org>2019-02-15 10:50:07 +0000
commitf2b2d9c670d55f1879948d97ca18fe087b724333 (patch)
treed7b7ea5179cbb6508c8a218adc41af8b1b62f26f /sdk/Makefile
parent291a9eacae205da9f699e72550d152e016dc8a89 (diff)
downloadtoolchains-f2b2d9c670d55f1879948d97ca18fe087b724333.tar.gz
toolchains-f2b2d9c670d55f1879948d97ca18fe087b724333.tar.bz2
fix m68k amiga openssl patches
Diffstat (limited to 'sdk/Makefile')
-rw-r--r--sdk/Makefile17
1 files changed, 10 insertions, 7 deletions
diff --git a/sdk/Makefile b/sdk/Makefile
index 3827095..70e37d0 100644
--- a/sdk/Makefile
+++ b/sdk/Makefile
@@ -336,22 +336,25 @@ $(SOURCEDIR)/pbl_$(VERSION_LIBPBL).tar.gz:
# OpenSSL
$(BUILDSTEPS)/openssl.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d $(BUILDSTEPS)/openssl-src.d
+ cd $(BUILDDIR)/openssl/openssl-$(VERSION_OPENSSL) && $(env) ./Configure --prefix=$(GCCSDK_INSTALL_ENV) $(TARGET) no-shared no-threads $(EXTRAARGS_OPENSSL)
+ cd $(BUILDDIR)/openssl/openssl-$(VERSION_OPENSSL) && $(env) make install
+ touch $@
+
+# prepare the openssl source tree
+$(BUILDSTEPS)/openssl-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/openssl-$(VERSION_OPENSSL).tar.gz
+ $(RM) -rf $(BUILDDIR)/openssl
mkdir -p $(BUILDDIR)/openssl
cd $(BUILDDIR)/openssl && tar xaf $(SOURCEDIR)/openssl-$(VERSION_OPENSSL).tar.gz
- for p in `ls $(RECIPES)/patches/openssl/*.p` ; do $(PATCH) -d $(BUILDDIR)/openssl/openssl-$(VERSION_OPENSSL) -p0 <$$p ; done
+ for p in `ls $(RECIPES)/patches/openssl/*.p` ; do $(PATCH) -d $(BUILDDIR)/openssl/openssl-$(VERSION_OPENSSL) -p0 <$$p || exit $0 ; done
ifneq ($(realpath $(RECIPES)/patches/openssl/$(TARGET)),)
- for p in `ls $(RECIPES)/patches/openssl/$(TARGET)/*.p` ; do $(PATCH) -d $(BUILDDIR)/openssl/openssl-$(VERSION_OPENSSL) -p0 <$$p ; done
+ for p in `ls $(RECIPES)/patches/openssl/$(TARGET)/*.p` ; do $(PATCH) -d $(BUILDDIR)/openssl/openssl-$(VERSION_OPENSSL) -p0 <$$p || exit $0 ; done
endif
ifneq ($(realpath $(RECIPES)/files/openssl/$(TARGET)),)
cp -r $(RECIPES)/files/openssl/$(TARGET)/* $(BUILDDIR)/openssl/openssl-$(VERSION_OPENSSL)
endif
- cd $(BUILDDIR)/openssl/openssl-$(VERSION_OPENSSL) && $(env) ./Configure --prefix=$(GCCSDK_INSTALL_ENV) $(TARGET) no-shared no-threads $(EXTRAARGS_OPENSSL)
- cd $(BUILDDIR)/openssl/openssl-$(VERSION_OPENSSL) && $(env) make install
- touch $@
-
-$(BUILDSTEPS)/openssl-src.d: $(BUILDSTEPS)/sourcedir.d $(SOURCEDIR)/openssl-$(VERSION_OPENSSL).tar.gz
touch $@
+# get the openssl source tar
$(SOURCEDIR)/openssl-$(VERSION_OPENSSL).tar.gz:
$(FETCHSRC) sdk $(subst $(SOURCEDIR)/,,$@) "http://www.openssl.org/source/$(subst $(SOURCEDIR)/,,$@)" $@