diff options
| author | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2019-06-18 08:39:53 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-18 08:39:53 (GMT) |
| commit | bd75abfefed31316fc627069597cc3c5087a885b (patch) | |
| tree | b02c3262fc493ccd5a85d23681ad7032e639c52e /Mac | |
| parent | ae526ee320d3feabba0aa4dffa9d52e39f8941dc (diff) | |
| download | cpython-bd75abfefed31316fc627069597cc3c5087a885b.zip cpython-bd75abfefed31316fc627069597cc3c5087a885b.tar.gz cpython-bd75abfefed31316fc627069597cc3c5087a885b.tar.bz2 | |
bpo-34631: Updated OpenSSL to 1.1.1c in macOS installer (GH-14187)
(cherry picked from commit f3fb8393e3cbbdc0ec79e0fdefaadec6977e1491)
Co-authored-by: Ned Deily <nad@python.org>
Diffstat (limited to 'Mac')
| -rwxr-xr-x | Mac/BuildScript/build-installer.py | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index 2c606b9..fe86f16 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -215,9 +215,9 @@ def library_recipes(): result.extend([ dict( - name="OpenSSL 1.1.0j", - url="https://www.openssl.org/source/openssl-1.1.0j.tar.gz", - checksum='b4ca5b78ae6ae79da80790b30dbedbdc', + name="OpenSSL 1.1.1c", + url="https://www.openssl.org/source/openssl-1.1.1c.tar.gz", + checksum='15e21da6efe8aa0e0768ffd8cd37a5f6', buildrecipe=build_universal_openssl, configure=None, install=None, @@ -810,6 +810,16 @@ def build_universal_openssl(basedir, archList): "ppc": ["darwin-ppc-cc"], "ppc64": ["darwin64-ppc-cc"], } + + # Somewhere between OpenSSL 1.1.0j and 1.1.1c, changes cause the + # "enable-ec_nistp_64_gcc_128" option to get compile errors when + # building on our 10.6 gcc-4.2 environment. There have been other + # reports of projects running into this when using older compilers. + # So, for now, do not try to use "enable-ec_nistp_64_gcc_128" when + # building for 10.6. + if getDeptargetTuple() == (10, 6): + arch_opts['x86_64'].remove('enable-ec_nistp_64_gcc_128') + configure_opts = [ "no-idea", "no-mdc2", |