summaryrefslogtreecommitdiffstats
path: root/Mac
diff options
context:
space:
mode:
authorNed Deily <nad@python.org>2016-10-31 23:54:17 (GMT)
committerNed Deily <nad@python.org>2016-10-31 23:54:17 (GMT)
commit1194234e663cf8b767000c63db68a98bbd259ec3 (patch)
treed0143106010660d13ef42ccff1dfe669a34c8b46 /Mac
parent473ce1d3e3d8794e0b6f540298127e26083fb521 (diff)
parent38adbfa71079f03747ac59f8eb848ab43fad753d (diff)
downloadcpython-1194234e663cf8b767000c63db68a98bbd259ec3.zip
cpython-1194234e663cf8b767000c63db68a98bbd259ec3.tar.gz
cpython-1194234e663cf8b767000c63db68a98bbd259ec3.tar.bz2
Issue #28248: merge from 3.5
Diffstat (limited to 'Mac')
-rwxr-xr-xMac/BuildScript/build-installer.py6
-rw-r--r--Mac/BuildScript/openssl_sdk_makedepend.patch12
2 files changed, 8 insertions, 10 deletions
diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
index aafccfd..8dfd092 100755
--- a/Mac/BuildScript/build-installer.py
+++ b/Mac/BuildScript/build-installer.py
@@ -213,9 +213,9 @@ def library_recipes():
result.extend([
dict(
- name="OpenSSL 1.0.2h",
- url="https://www.openssl.org/source/openssl-1.0.2h.tar.gz",
- checksum='9392e65072ce4b614c1392eefc1f23d0',
+ name="OpenSSL 1.0.2j",
+ url="https://www.openssl.org/source/openssl-1.0.2j.tar.gz",
+ checksum='96322138f0b69e61b7212bc53d5e912b',
patches=[
"openssl_sdk_makedepend.patch",
],
diff --git a/Mac/BuildScript/openssl_sdk_makedepend.patch b/Mac/BuildScript/openssl_sdk_makedepend.patch
index 96a8841..e22d67e 100644
--- a/Mac/BuildScript/openssl_sdk_makedepend.patch
+++ b/Mac/BuildScript/openssl_sdk_makedepend.patch
@@ -1,8 +1,6 @@
# HG changeset patch
-# Parent d377390f787c0739a3e89f669def72d7167e5108
-# openssl_sdk_makedepend.patch
#
-# using openssl 1.0.2f
+# using openssl 1.0.2j
#
# - support building with an OS X SDK
@@ -11,7 +9,7 @@ diff Configure
diff --git a/Configure b/Configure
--- a/Configure
+++ b/Configure
-@@ -638,12 +638,12 @@
+@@ -642,12 +642,12 @@
##### MacOS X (a.k.a. Rhapsody or Darwin) setup
"rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX_RHAPSODY::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}::",
@@ -30,13 +28,13 @@ diff --git a/Configure b/Configure
"debug-darwin-ppc-cc","cc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DCRYPTO_MDEBUG -DB_ENDIAN -g -Wall -O::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
# iPhoneOS/iOS
"iphoneos-cross","llvm-gcc:-O3 -isysroot \$(CROSS_TOP)/SDKs/\$(CROSS_SDK) -fomit-frame-pointer -fno-common::-D_REENTRANT:iOS:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:darwin-shared:-fPIC -fno-common:-dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-@@ -1717,8 +1717,7 @@
- s/^CC=.*$/CC= $cc/;
+@@ -1728,8 +1728,7 @@
s/^AR=\s*ar/AR= $ar/;
s/^RANLIB=.*/RANLIB= $ranlib/;
+ s/^RC=.*/RC= $windres/;
- s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $cc eq "gcc";
- s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $ecc eq "gcc" || $ecc eq "clang";
-+ s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/
++ s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/;
}
s/^CFLAG=.*$/CFLAG= $cflags/;
s/^DEPFLAG=.*$/DEPFLAG=$depflags/;