summaryrefslogtreecommitdiffstats
path: root/Mac
diff options
context:
space:
mode:
authorNed Deily <nad@acm.org>2015-01-09 21:33:28 (GMT)
committerNed Deily <nad@acm.org>2015-01-09 21:33:28 (GMT)
commit0e98b83f00ace1afcc2a70dd1ee90a08ad3eb846 (patch)
tree12331e81720f5f094355fbc15d83fe0c0c9b8ef2 /Mac
parentc50a9c1617a6d98e23108a3ab5d1d826ae955895 (diff)
parent54362ca1da1f4d9b2e1edb78abaea54af0cfaa2c (diff)
downloadcpython-0e98b83f00ace1afcc2a70dd1ee90a08ad3eb846.zip
cpython-0e98b83f00ace1afcc2a70dd1ee90a08ad3eb846.tar.gz
cpython-0e98b83f00ace1afcc2a70dd1ee90a08ad3eb846.tar.bz2
Issue #23212: merge from 3.4
Diffstat (limited to 'Mac')
-rwxr-xr-xMac/BuildScript/build-installer.py6
-rw-r--r--Mac/BuildScript/openssl_sdk_makedepend.patch16
2 files changed, 12 insertions, 10 deletions
diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
index d0c91ec..379cb95 100755
--- a/Mac/BuildScript/build-installer.py
+++ b/Mac/BuildScript/build-installer.py
@@ -237,9 +237,9 @@ def library_recipes():
result.extend([
dict(
- name="OpenSSL 1.0.1j",
- url="https://www.openssl.org/source/openssl-1.0.1j.tar.gz",
- checksum='f7175c9cd3c39bb1907ac8bba9df8ed3',
+ name="OpenSSL 1.0.1k",
+ url="https://www.openssl.org/source/openssl-1.0.1k.tar.gz",
+ checksum='d4f002bd22a56881340105028842ae1f',
patches=[
"openssl_sdk_makedepend.patch",
],
diff --git a/Mac/BuildScript/openssl_sdk_makedepend.patch b/Mac/BuildScript/openssl_sdk_makedepend.patch
index 6f95487..a72f5a3 100644
--- a/Mac/BuildScript/openssl_sdk_makedepend.patch
+++ b/Mac/BuildScript/openssl_sdk_makedepend.patch
@@ -1,13 +1,15 @@
# openssl_sdk_makedepend.patch
#
-# using openssl 1.0.1j
+# using openssl 1.0.1k
#
# - support building with an OS X SDK
# - allow "make depend" to use compilers with names other than "gcc"
diff Configure
---- a/Configure Fri Dec 05 01:24:16 2014 -0800
-+++ b/Configure Fri Dec 05 01:52:29 2014 -0800
+
+diff -r 99ae439a07f1 Configure
+--- a/Configure Fri Jan 09 12:50:43 2015 -0800
++++ b/Configure Fri Jan 09 12:53:52 2015 -0800
@@ -577,11 +577,11 @@
##### MacOS X (a.k.a. Rhapsody or Darwin) setup
@@ -25,7 +27,7 @@ diff 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",
-@@ -1624,7 +1624,7 @@
+@@ -1629,7 +1629,7 @@
s/^CC=.*$/CC= $cc/;
s/^AR=\s*ar/AR= $ar/;
s/^RANLIB=.*/RANLIB= $ranlib/;
@@ -34,9 +36,9 @@ diff Configure
}
s/^CFLAG=.*$/CFLAG= $cflags/;
s/^DEPFLAG=.*$/DEPFLAG=$depflags/;
-diff util/domd
---- a/util/domd Fri Dec 05 01:24:16 2014 -0800
-+++ b/util/domd Fri Dec 05 01:52:29 2014 -0800
+diff -r 99ae439a07f1 util/domd
+--- a/util/domd Fri Jan 09 12:50:43 2015 -0800
++++ b/util/domd Fri Jan 09 12:53:52 2015 -0800
@@ -14,7 +14,7 @@
cp Makefile Makefile.save
# fake the presence of Kerberos