Update macOS build-installer script comments for 3.10 and remove unused pre-10.5 vestiges. (GH-27253)
(cherry picked from commit 42205ee512159de62c01e202ff799d78fac9ac26)
Co-authored-by: Ned Deily <nad@python.org>
diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
index 60174eb..56d3d4b 100755
--- a/Mac/BuildScript/build-installer.py
+++ b/Mac/BuildScript/build-installer.py
@@ -2,6 +2,10 @@
"""
This script is used to build "official" universal installers on macOS.
+NEW for 3.10 and backports:
+- support universal2 variant with arm64 and x86_64 archs
+- enable clang optimizations when building on 10.15+
+
NEW for 3.9.0 and backports:
- 2.7 end-of-life issues:
- Python 3 installs now update the Current version link
@@ -236,8 +240,6 @@ def tweak_tcl_build(basedir, archList):
def library_recipes():
result = []
- LT_10_5 = bool(getDeptargetTuple() < (10, 5))
-
# Since Apple removed the header files for the deprecated system
# OpenSSL as of the Xcode 7 release (for OS X 10.10+), we do not
# have much choice but to build our own copy here, too.
@@ -367,7 +369,7 @@ def library_recipes():
'-DSQLITE_ENABLE_RTREE '
'-DSQLITE_OMIT_AUTOINIT '
'-DSQLITE_TCL=0 '
- '%s' % ('','-DSQLITE_WITHOUT_ZONEMALLOC ')[LT_10_5]),
+ ),
configure_pre=[
'--enable-threadsafe',
'--enable-shared=no',
@@ -378,47 +380,6 @@ def library_recipes():
),
])
- if getDeptargetTuple() < (10, 5):
- result.extend([
- dict(
- name="Bzip2 1.0.6",
- url="http://bzip.org/1.0.6/bzip2-1.0.6.tar.gz",
- checksum='00b516f4704d4a7cb50a1d97e6e8e15b',
- configure=None,
- install='make install CC=%s CXX=%s, PREFIX=%s/usr/local/ CFLAGS="-arch %s"'%(
- CC, CXX,
- shellQuote(os.path.join(WORKDIR, 'libraries')),
- ' -arch '.join(ARCHLIST),
- ),
- ),
- dict(
- name="ZLib 1.2.3",
- url="http://www.gzip.org/zlib/zlib-1.2.3.tar.gz",
- checksum='debc62758716a169df9f62e6ab2bc634',
- configure=None,
- install='make install CC=%s CXX=%s, prefix=%s/usr/local/ CFLAGS="-arch %s"'%(
- CC, CXX,
- shellQuote(os.path.join(WORKDIR, 'libraries')),
- ' -arch '.join(ARCHLIST),
- ),
- ),
- dict(
- # Note that GNU readline is GPL'd software
- name="GNU Readline 6.1.2",
- url="http://ftp.gnu.org/pub/gnu/readline/readline-6.1.tar.gz" ,
- checksum='fc2f7e714fe792db1ce6ddc4c9fb4ef3',
- patchlevel='0',
- patches=[
- # The readline maintainers don't do actual micro releases, but
- # just ship a set of patches.
- ('http://ftp.gnu.org/pub/gnu/readline/readline-6.1-patches/readline61-001',
- 'c642f2e84d820884b0bf9fd176bc6c3f'),
- ('http://ftp.gnu.org/pub/gnu/readline/readline-6.1-patches/readline61-002',
- '1a76781a1ea734e831588285db7ec9b1'),
- ]
- ),
- ])
-
if not PYTHON_3:
result.extend([
dict(