aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwsnipex <wsnipex@a1.net>2015-10-27 10:35:22 +0100
committerwsnipex <wsnipex@a1.net>2015-10-27 13:54:14 +0100
commitbe9c21195b3ce9292cdf989525dff0a2c04ce0e6 (patch)
tree176f0dedc22d87762baf379c7927b9f05f1ba690
parente83e2f946c10b3e0b4a7990e37717aa694368304 (diff)
[depends] bump openssl to 1.0.2d
-rw-r--r--tools/depends/target/openssl/Makefile12
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/depends/target/openssl/Makefile b/tools/depends/target/openssl/Makefile
index 01014ff342..c081a12bf2 100644
--- a/tools/depends/target/openssl/Makefile
+++ b/tools/depends/target/openssl/Makefile
@@ -3,14 +3,14 @@ DEPS= ../../Makefile.include Makefile
# lib name, version
LIBNAME=openssl
-VERSION=1.0.1j
+VERSION=1.0.2d
SOURCE=$(LIBNAME)-$(VERSION)
ARCHIVE=$(SOURCE).tar.gz
# configuration settings
-CONFIGURE=MACHINE=$(PLATFORM) ./config shared zlib --openssldir=$(PREFIX) --with-zlib-include=$(PREFIX)/include --with-zlib-lib=$(PREFIX)/lib no-asm
+CONFIGURE=MACHINE=$(PLATFORM) ./config shared zlib --openssldir=$(PREFIX) --with-zlib-include=$(PREFIX)/include --with-zlib-lib=$(PREFIX)/lib
ifeq ($(OS), android)
- CONFIGURE=./Configure shared zlib --openssldir=$(PREFIX) --with-zlib-include=$(PREFIX)/include --with-zlib-lib=$(PREFIX)/lib no-asm linux-generic32
+ CONFIGURE=./Configure shared zlib --openssldir=$(PREFIX) --with-zlib-include=$(PREFIX)/include --with-zlib-lib=$(PREFIX)/lib linux-generic32
endif
ifeq ($(OS), ios)
# No darwin-arm-cc so use darwin-i386-cc and patch files after configure
@@ -18,9 +18,9 @@ ifeq ($(OS), ios)
endif
ifeq ($(OS), osx)
ifeq ($(CPU),x86_64)
- CONFIGURE=./Configure darwin64-$(CPU)-cc zlib no-asm no-krb5 shared --openssldir=$(PREFIX)
+ CONFIGURE=./Configure darwin64-$(CPU)-cc zlib no-krb5 shared --openssldir=$(PREFIX)
else
- CONFIGURE=./Configure darwin-$(CPU)-cc zlib no-asm no-krb5 shared --openssldir=$(PREFIX)
+ CONFIGURE=./Configure darwin-$(CPU)-cc zlib no-krb5 shared --openssldir=$(PREFIX)
endif
endif
LIBDYLIB=$(PLATFORM)/libssl.a
@@ -49,7 +49,7 @@ $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
fi
$(LIBDYLIB): $(PLATFORM)
- $(MAKE) -j 1 -C $(PLATFORM)
+ $(MAKE) -C $(PLATFORM)
touch $@
.installed-$(PLATFORM): $(LIBDYLIB)