diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2018-09-11 16:53:20 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-11 16:53:20 -0700 |
| commit | aa02ab15aed9d0b70f619c186326594c0d50bdd6 (patch) | |
| tree | 6c3aaede014a5712d0a14e8707665a8d66c8d5d5 /Mac | |
| parent | d919c60e6936f853ad15040017f2c0bce0f027f8 (diff) | |
| download | cpython-git-aa02ab15aed9d0b70f619c186326594c0d50bdd6.tar.gz | |
[2.7] bpo-34405: Update to OpenSSL 1.0.2p for macOS installer builds (GH-9191) (GH-9196)
(cherry picked from commit 31912b43c903aafad09350899ed6a9dec7c43421)
Co-authored-by: Ned Deily <nad@python.org>
<!-- issue-number: [bpo-34405](https://www.bugs.python.org/issue34405) -->
https://bugs.python.org/issue34405
<!-- /issue-number -->
Diffstat (limited to 'Mac')
| -rwxr-xr-x | Mac/BuildScript/build-installer.py | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index 038e1917c4..b97d55bb03 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -211,9 +211,9 @@ def library_recipes(): result.extend([ dict( - name="OpenSSL 1.0.2o", - url="https://www.openssl.org/source/openssl-1.0.2o.tar.gz", - checksum='44279b8557c3247cbe324e2322ecd114', + name="OpenSSL 1.0.2p", + url="https://www.openssl.org/source/openssl-1.0.2p.tar.gz", + checksum='ac5eb30bf5798aa14b1ae6d0e7da58df', buildrecipe=build_universal_openssl, configure=None, install=None, @@ -824,6 +824,13 @@ def build_universal_openssl(basedir, archList): ] if no_asm: configure_opts.append("no-asm") + # OpenSSL 1.0.2o broke the Configure test for whether the compiler + # in use supports dependency rule generation (cc -M) with gcc-4.2 + # used for the 10.6+ installer builds. Patch Configure here to + # force use of "cc -M" rather than "makedepend". + runCommand( + """sed -i "" 's|my $cc_as_makedepend = 0|my $cc_as_makedepend = 1|g' Configure""") + runCommand(" ".join(["perl", "Configure"] + arch_opts[arch] + configure_opts)) runCommand("make depend") |