Skip to content
This repository was archived by the owner on Mar 30, 2019. It is now read-only.

Commit 1beb8ae

Browse files
committedJul 28, 2015
Bumped OpenSSL version, and made downloads more robust.
1 parent a04adee commit 1beb8ae

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed
 

‎Makefile

+8-4
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
PROJECTDIR=$(shell pwd)
22

3-
BUILD_NUMBER=2
3+
BUILD_NUMBER=3
44

55
# Version of packages that will be compiled by this meta-package
66
PYTHON_VERSION=3.4.2
7-
OPENSSL_VERSION=1.0.2c
7+
8+
OPENSSL_VERSION_NUMBER=1.0.2
9+
OPENSSL_REVISION=d
10+
OPENSSL_VERSION=$(OPENSSL_VERSION_NUMBER)$(OPENSSL_REVISION)
811

912
# 32 bit iOS Simulator build commands and flags
1013
IOS_SIMULATOR_SDK_ROOT=$(shell xcrun --sdk iphonesimulator --show-sdk-path)
@@ -66,7 +69,8 @@ clean-OpenSSL:
6669

6770
# Download original OpenSSL source code archive.
6871
downloads/openssl-$(OPENSSL_VERSION).tgz: downloads
69-
curl -L http://openssl.org/source/openssl-$(OPENSSL_VERSION).tar.gz > downloads/openssl-$(OPENSSL_VERSION).tgz
72+
-if [ ! -e downloads/openssl-$(OPENSSL_VERSION).tgz ]; then curl --fail -L http://openssl.org/source/openssl-$(OPENSSL_VERSION).tar.gz -o downloads/openssl-$(OPENSSL_VERSION).tgz; fi
73+
if [ ! -e downloads/openssl-$(OPENSSL_VERSION).tgz ]; then curl --fail -L http://openssl.org/source/old/$(OPENSSL_VERSION_NUMBER)/openssl-$(OPENSSL_VERSION).tar.gz -o downloads/openssl-$(OPENSSL_VERSION).tgz; fi
7074

7175
build/OpenSSL/ios-simulator-i386/libssl.a: build downloads/openssl-$(OPENSSL_VERSION).tgz
7276
# Unpack sources
@@ -250,7 +254,7 @@ clean-Python:
250254

251255
# Download original Python source code archive.
252256
downloads/Python-$(PYTHON_VERSION).tgz: downloads
253-
curl -L https://www.python.org/ftp/python/$(PYTHON_VERSION)/Python-$(PYTHON_VERSION).tgz > downloads/Python-$(PYTHON_VERSION).tgz
257+
if [ ! -e downloads/Python-$(PYTHON_VERSION).tgz ]; then curl -L https://www.python.org/ftp/python/$(PYTHON_VERSION)/Python-$(PYTHON_VERSION).tgz > downloads/Python-$(PYTHON_VERSION).tgz; fi
254258

255259
# build/Python-$(PYTHON_VERSION)/Python.framework: build dist/OpenSSL.framework downloads/Python-$(PYTHON_VERSION).tgz
256260
build/Python-$(PYTHON_VERSION)/Python.framework: build downloads/Python-$(PYTHON_VERSION).tgz

0 commit comments

Comments
 (0)