cpython: c7e551f8c5d8 (original) (raw)
Mercurial > cpython
changeset 104857:c7e551f8c5d8 3.6
Issue #28248: merge from 3.5 [#28248]
| Ned Deily nad@python.org | |
|---|---|
| date | Mon, 31 Oct 2016 19:54:17 -0400 |
| parents | 88e3df38d591(current diff)a8799a63feb7(diff) |
| children | 9e66ffa7a791 6f0b41a7a621 |
| files | Mac/BuildScript/build-installer.py Misc/NEWS |
| diffstat | 3 files changed, 9 insertions(+), 11 deletions(-)[+] [-] Mac/BuildScript/build-installer.py 6 Mac/BuildScript/openssl_sdk_makedepend.patch 12 Misc/NEWS 2 |
line wrap: on
line diff
--- 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",[](#l1.7)url="https://www.openssl.org/source/openssl-1.0.2h.tar.gz",[](#l1.8)checksum='9392e65072ce4b614c1392eefc1f23d0',[](#l1.9)
name="OpenSSL 1.0.2j",[](#l1.10)url="https://www.openssl.org/source/openssl-1.0.2j.tar.gz",[](#l1.11)checksum='96322138f0b69e61b7212bc53d5e912b',[](#l1.12) patches=[[](#l1.13) "openssl_sdk_makedepend.patch",[](#l1.14) ],[](#l1.15)
--- 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 @@
+@@ -1728,8 +1728,7 @@ s/^AR=\sar/AR= $ar/; s/^RANLIB=./RANLIB= $ranlib/;s/^CC=.*$/CC= $cc/;[](#l2.27)
s/^RC=.*/RC= $windres/;[](#l2.31)
s/^MAKEDEPPROG=.*$/MAKEDEPPROG= <span class="katex"><span class="katex-mathml"><math xmlns="http://www.w3.org/1998/Math/MathML"><semantics><mrow><mi>c</mi><mi>c</mi><mi mathvariant="normal">/</mi><mi>i</mi><mi>f</mi></mrow><annotation encoding="application/x-tex">cc/ if </annotation></semantics></math></span><span class="katex-html" aria-hidden="true"><span class="base"><span class="strut" style="height:1em;vertical-align:-0.25em;"></span><span class="mord mathnormal">cc</span><span class="mord">/</span><span class="mord mathnormal">i</span><span class="mord mathnormal" style="margin-right:0.10764em;">f</span></span></span></span>cc eq "gcc";[](#l2.32)s/^MAKEDEPPROG=.*$/MAKEDEPPROG= <span class="katex"><span class="katex-mathml"><math xmlns="http://www.w3.org/1998/Math/MathML"><semantics><mrow><mi>c</mi><mi>c</mi><mi mathvariant="normal">/</mi><mi>i</mi><mi>f</mi></mrow><annotation encoding="application/x-tex">cc/ if </annotation></semantics></math></span><span class="katex-html" aria-hidden="true"><span class="base"><span class="strut" style="height:1em;vertical-align:-0.25em;"></span><span class="mord mathnormal">cc</span><span class="mord">/</span><span class="mord mathnormal">i</span><span class="mord mathnormal" style="margin-right:0.10764em;">f</span></span></span></span>ecc eq "gcc" || $ecc eq "clang";[](#l2.33)
-+ s/^MAKEDEPPROG=.$/MAKEDEPPROG= $cc/ ++ s/^MAKEDEPPROG=.$/MAKEDEPPROG= $cc/; } s/^CFLAG=.$/CFLAG= $cflags/; s/^DEPFLAG=.$/DEPFLAG=$depflags/;