bpo-32726: macOS installer changes for 3.6.5
Backport the new 10.9+ installer variant from 3.7. This variant features more modern options; like 64-bit only (Apple is deprecating 32-bit support in future macOS releases); a built-in version of Tcl/Tk 8.6.8; built with clang rather than gcc-4.2. For 3.6.5, the 10.9+ variant will be offered as an additional alternative to the traditional 10.6+ variant in earlier 3.6.x releases. Binary extension modules (including wheels) built for earlier versions of 3.6.x with the 10.6 variant should continue to work with either 3.6.5 variant without recompilation. In addition, both installer variants have updated 3rd-party libraries: OpenSSL 1.0.2m -> 1.0.2n XZ 5.2.2 -> 5.2.3 SQLite 3.21.0 -> 3.22.0 Also the 10.6 variant now sets CC=gcc instead of CC=gcc-4.2 and does not search for the outdated 10.6 SDK. The variant is built with the same compiler as before. As before, for extension module builds, the CC can be overridden with the CC env variable and an SDK can be specified with the SDKROOT env variable (see man xcrun). These minor changes should be transparent to nearly all users.
This commit is contained in:
Ned Deily
parent
cad3eb2026
commit
94552448d7
|
|
@ -1,30 +1,36 @@
|
|||
#!/usr/bin/env python
|
||||
"""
|
||||
This script is used to build "official" universal installers on Mac OS X.
|
||||
It requires at least Mac OS X 10.5, Xcode 3, and the 10.4u SDK for
|
||||
32-bit builds. 64-bit or four-way universal builds require at least
|
||||
OS X 10.5 and the 10.5 SDK.
|
||||
This script is used to build "official" universal installers on macOS.
|
||||
|
||||
NEW for 3.6.5:
|
||||
- support Intel 64-bit-only () and 32-bit-only installer builds
|
||||
- build and link with private Tcl/Tk 8.6 for 10.9+ builds
|
||||
- deprecate use of explicit SDK (--sdk-path=) since all but the oldest
|
||||
versions of Xcode support implicit setting of an SDK via environment
|
||||
variables (SDKROOT and friends, see the xcrun man page for more info).
|
||||
The SDK stuff was primarily needed for building universal installers
|
||||
for 10.4; so as of 3.6.5, building installers for 10.4 is no longer
|
||||
supported with build-installer.
|
||||
- use generic "gcc" as compiler (CC env var) rather than "gcc-4.2"
|
||||
|
||||
Please ensure that this script keeps working with Python 2.5, to avoid
|
||||
bootstrap issues (/usr/bin/python is Python 2.5 on OSX 10.5). Sphinx,
|
||||
which is used to build the documentation, currently requires at least
|
||||
Python 2.4. However, as of Python 3.4.1, Doc builds require an external
|
||||
sphinx-build and the current versions of Sphinx now require at least
|
||||
Python 2.6.
|
||||
bootstrap issues (/usr/bin/python is Python 2.5 on OSX 10.5). Doc builds
|
||||
use current versions of Sphinx and require a reasonably current python3.
|
||||
Sphinx and dependencies are installed into a venv using the python3's pip
|
||||
so will fetch them from PyPI if necessary. Since python3 is now used for
|
||||
Sphinx, build-installer.py should also be converted to use python3!
|
||||
|
||||
In addition to what is supplied with OS X 10.5+ and Xcode 3+, the script
|
||||
requires an installed third-party version of
|
||||
Tcl/Tk 8.4 (for OS X 10.4 and 10.5 deployment targets) or Tcl/TK 8.5
|
||||
For 10.9 or greater deployment targets, build-installer builds and links
|
||||
with its own copy of Tcl/Tk 8.5 and the rest of this paragraph does not
|
||||
apply. Otherwise, build-installer requires an installed third-party version
|
||||
of Tcl/Tk 8.4 (for OS X 10.4 and 10.5 deployment targets) or Tcl/TK 8.5
|
||||
(for 10.6 or later) installed in /Library/Frameworks. When installed,
|
||||
the Python built by this script will attempt to dynamically link first to
|
||||
Tcl and Tk frameworks in /Library/Frameworks if available otherwise fall
|
||||
back to the ones in /System/Library/Framework. For the build, we recommend
|
||||
installing the most recent ActiveTcl 8.4 or 8.5 version.
|
||||
|
||||
32-bit-only installer builds are still possible on OS X 10.4 with Xcode 2.5
|
||||
and the installation of additional components, such as a newer Python
|
||||
(2.5 is needed for Python parser updates) and for the documentation
|
||||
build either svn (pre-3.4.1) or sphinx-build (3.4.1 and later).
|
||||
installing the most recent ActiveTcl 8.5 or 8.4 version, depending
|
||||
on the deployment target. The actual version linked to depends on the
|
||||
path of /Library/Frameworks/{Tcl,Tk}.framework/Versions/Current.
|
||||
|
||||
Usage: see USAGE variable in the script.
|
||||
"""
|
||||
|
|
@ -111,32 +117,19 @@ WORKDIR = "/tmp/_py"
|
|||
DEPSRC = os.path.join(WORKDIR, 'third-party')
|
||||
DEPSRC = os.path.expanduser('~/Universal/other-sources')
|
||||
|
||||
# Location of the preferred SDK
|
||||
|
||||
### There are some issues with the SDK selection below here,
|
||||
### The resulting binary doesn't work on all platforms that
|
||||
### it should. Always default to the 10.4u SDK until that
|
||||
### issue is resolved.
|
||||
###
|
||||
##if int(os.uname()[2].split('.')[0]) == 8:
|
||||
## # Explicitly use the 10.4u (universal) SDK when
|
||||
## # building on 10.4, the system headers are not
|
||||
## # useable for a universal build
|
||||
## SDKPATH = "/Developer/SDKs/MacOSX10.4u.sdk"
|
||||
##else:
|
||||
## SDKPATH = "/"
|
||||
|
||||
SDKPATH = "/Developer/SDKs/MacOSX10.4u.sdk"
|
||||
|
||||
universal_opts_map = { '32-bit': ('i386', 'ppc',),
|
||||
'64-bit': ('x86_64', 'ppc64',),
|
||||
'intel': ('i386', 'x86_64'),
|
||||
'intel-32': ('i386',),
|
||||
'intel-64': ('x86_64',),
|
||||
'3-way': ('ppc', 'i386', 'x86_64'),
|
||||
'all': ('i386', 'ppc', 'x86_64', 'ppc64',) }
|
||||
default_target_map = {
|
||||
'64-bit': '10.5',
|
||||
'3-way': '10.5',
|
||||
'intel': '10.5',
|
||||
'intel-32': '10.4',
|
||||
'intel-64': '10.5',
|
||||
'all': '10.5',
|
||||
}
|
||||
|
||||
|
|
@ -154,19 +147,18 @@ SRCDIR = os.path.dirname(
|
|||
))))
|
||||
|
||||
# $MACOSX_DEPLOYMENT_TARGET -> minimum OS X level
|
||||
DEPTARGET = '10.3'
|
||||
DEPTARGET = '10.5'
|
||||
|
||||
def getDeptargetTuple():
|
||||
return tuple([int(n) for n in DEPTARGET.split('.')[0:2]])
|
||||
|
||||
def getTargetCompilers():
|
||||
target_cc_map = {
|
||||
'10.3': ('gcc-4.0', 'g++-4.0'),
|
||||
'10.4': ('gcc-4.0', 'g++-4.0'),
|
||||
'10.5': ('gcc-4.2', 'g++-4.2'),
|
||||
'10.6': ('gcc-4.2', 'g++-4.2'),
|
||||
'10.5': ('gcc', 'g++'),
|
||||
'10.6': ('gcc', 'g++'),
|
||||
}
|
||||
return target_cc_map.get(DEPTARGET, ('clang', 'clang++') )
|
||||
return target_cc_map.get(DEPTARGET, ('gcc', 'g++') )
|
||||
|
||||
CC, CXX = getTargetCompilers()
|
||||
|
||||
|
|
@ -180,9 +172,9 @@ USAGE = textwrap.dedent("""\
|
|||
-b DIR
|
||||
--build-dir=DIR: Create build here (default: %(WORKDIR)r)
|
||||
--third-party=DIR: Store third-party sources here (default: %(DEPSRC)r)
|
||||
--sdk-path=DIR: Location of the SDK (default: %(SDKPATH)r)
|
||||
--sdk-path=DIR: Location of the SDK (deprecated, use SDKROOT env variable)
|
||||
--src-dir=DIR: Location of the Python sources (default: %(SRCDIR)r)
|
||||
--dep-target=10.n OS X deployment target (default: %(DEPTARGET)r)
|
||||
--dep-target=10.n macOS deployment target (default: %(DEPTARGET)r)
|
||||
--universal-archs=x universal architectures (options: %(UNIVERSALOPTS)r, default: %(UNIVERSALARCHS)r)
|
||||
""")% globals()
|
||||
|
||||
|
|
@ -194,6 +186,11 @@ USAGE = textwrap.dedent("""\
|
|||
# '/Library/Frameworks/Tk.framework/Versions/8.5/Tk']
|
||||
EXPECTED_SHARED_LIBS = {}
|
||||
|
||||
# Are we building and linking with our own copy of Tcl/TK?
|
||||
# For now, do so if deployment target is 10.9+.
|
||||
def internalTk():
|
||||
return getDeptargetTuple() >= (10, 9)
|
||||
|
||||
# List of names of third party software built with this installer.
|
||||
# The names will be inserted into the rtf version of the License.
|
||||
THIRD_PARTY_LIBS = []
|
||||
|
|
@ -213,25 +210,21 @@ def library_recipes():
|
|||
|
||||
result.extend([
|
||||
dict(
|
||||
name="OpenSSL 1.0.2m",
|
||||
url="https://www.openssl.org/source/openssl-1.0.2m.tar.gz",
|
||||
checksum='10e9e37f492094b9ef296f68f24a7666',
|
||||
patches=[
|
||||
"openssl_sdk_makedepend.patch",
|
||||
],
|
||||
name="OpenSSL 1.0.2n",
|
||||
url="https://www.openssl.org/source/openssl-1.0.2n.tar.gz",
|
||||
checksum='13bdc1b1d1ff39b6fd42a255e74676a4',
|
||||
buildrecipe=build_universal_openssl,
|
||||
configure=None,
|
||||
install=None,
|
||||
),
|
||||
])
|
||||
|
||||
# Disable for now
|
||||
if False: # if getDeptargetTuple() > (10, 5):
|
||||
if internalTk():
|
||||
result.extend([
|
||||
dict(
|
||||
name="Tcl 8.5.15",
|
||||
url="ftp://ftp.tcl.tk/pub/tcl//tcl8_5/tcl8.5.15-src.tar.gz",
|
||||
checksum='f3df162f92c69b254079c4d0af7a690f',
|
||||
name="Tcl 8.6.8",
|
||||
url="ftp://ftp.tcl.tk/pub/tcl//tcl8_6/tcl8.6.8-src.tar.gz",
|
||||
checksum='81656d3367af032e0ae6157eff134f89',
|
||||
buildDir="unix",
|
||||
configure_pre=[
|
||||
'--enable-shared',
|
||||
|
|
@ -241,15 +234,15 @@ def library_recipes():
|
|||
useLDFlags=False,
|
||||
install='make TCL_LIBRARY=%(TCL_LIBRARY)s && make install TCL_LIBRARY=%(TCL_LIBRARY)s DESTDIR=%(DESTDIR)s'%{
|
||||
"DESTDIR": shellQuote(os.path.join(WORKDIR, 'libraries')),
|
||||
"TCL_LIBRARY": shellQuote('/Library/Frameworks/Python.framework/Versions/%s/lib/tcl8.5'%(getVersion())),
|
||||
"TCL_LIBRARY": shellQuote('/Library/Frameworks/Python.framework/Versions/%s/lib/tcl8.6'%(getVersion())),
|
||||
},
|
||||
),
|
||||
dict(
|
||||
name="Tk 8.5.15",
|
||||
url="ftp://ftp.tcl.tk/pub/tcl//tcl8_5/tk8.5.15-src.tar.gz",
|
||||
checksum='55b8e33f903210a4e1c8bce0f820657f',
|
||||
name="Tk 8.6.8",
|
||||
url="ftp://ftp.tcl.tk/pub/tcl//tcl8_6/tk8.6.8-src.tar.gz",
|
||||
checksum='5e0faecba458ee1386078fb228d008ba',
|
||||
patches=[
|
||||
"issue19373_tk_8_5_15_source.patch",
|
||||
"tk868_on_10_8_10_9.patch",
|
||||
],
|
||||
buildDir="unix",
|
||||
configure_pre=[
|
||||
|
|
@ -261,8 +254,8 @@ def library_recipes():
|
|||
useLDFlags=False,
|
||||
install='make TCL_LIBRARY=%(TCL_LIBRARY)s TK_LIBRARY=%(TK_LIBRARY)s && make install TCL_LIBRARY=%(TCL_LIBRARY)s TK_LIBRARY=%(TK_LIBRARY)s DESTDIR=%(DESTDIR)s'%{
|
||||
"DESTDIR": shellQuote(os.path.join(WORKDIR, 'libraries')),
|
||||
"TCL_LIBRARY": shellQuote('/Library/Frameworks/Python.framework/Versions/%s/lib/tcl8.5'%(getVersion())),
|
||||
"TK_LIBRARY": shellQuote('/Library/Frameworks/Python.framework/Versions/%s/lib/tk8.5'%(getVersion())),
|
||||
"TCL_LIBRARY": shellQuote('/Library/Frameworks/Python.framework/Versions/%s/lib/tcl8.6'%(getVersion())),
|
||||
"TK_LIBRARY": shellQuote('/Library/Frameworks/Python.framework/Versions/%s/lib/tk8.6'%(getVersion())),
|
||||
},
|
||||
),
|
||||
])
|
||||
|
|
@ -270,9 +263,9 @@ def library_recipes():
|
|||
if PYTHON_3:
|
||||
result.extend([
|
||||
dict(
|
||||
name="XZ 5.2.2",
|
||||
url="http://tukaani.org/xz/xz-5.2.2.tar.gz",
|
||||
checksum='7cf6a8544a7dae8e8106fdf7addfa28c',
|
||||
name="XZ 5.2.3",
|
||||
url="http://tukaani.org/xz/xz-5.2.3.tar.gz",
|
||||
checksum='ef68674fb47a8b8e741b34e429d86e9d',
|
||||
configure_pre=[
|
||||
'--disable-dependency-tracking',
|
||||
]
|
||||
|
|
@ -315,13 +308,14 @@ def library_recipes():
|
|||
),
|
||||
),
|
||||
dict(
|
||||
name="SQLite 3.21.0",
|
||||
url="https://www.sqlite.org/2017/sqlite-autoconf-3210000.tar.gz",
|
||||
checksum='7913de4c3126ba3c24689cb7a199ea31',
|
||||
name="SQLite 3.22.0",
|
||||
url="https://www.sqlite.org/2018/sqlite-autoconf-3220000.tar.gz",
|
||||
checksum='96b5648d542e8afa6ab7ffb8db8ddc3d',
|
||||
extra_cflags=('-Os '
|
||||
'-DSQLITE_ENABLE_FTS5 '
|
||||
'-DSQLITE_ENABLE_FTS4 '
|
||||
'-DSQLITE_ENABLE_FTS3_PARENTHESIS '
|
||||
'-DSQLITE_ENABLE_JSON1 '
|
||||
'-DSQLITE_ENABLE_RTREE '
|
||||
'-DSQLITE_TCL=0 '
|
||||
'%s' % ('','-DSQLITE_WITHOUT_ZONEMALLOC ')[LT_10_5]),
|
||||
|
|
@ -342,11 +336,10 @@ def library_recipes():
|
|||
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 -isysroot %s"'%(
|
||||
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),
|
||||
SDKPATH,
|
||||
),
|
||||
),
|
||||
dict(
|
||||
|
|
@ -354,11 +347,10 @@ def library_recipes():
|
|||
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 -isysroot %s"'%(
|
||||
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),
|
||||
SDKPATH,
|
||||
),
|
||||
),
|
||||
dict(
|
||||
|
|
@ -405,8 +397,7 @@ def pkg_recipes():
|
|||
source="/Library/Frameworks/Python.framework",
|
||||
readme="""\
|
||||
This package installs Python.framework, that is the python
|
||||
interpreter and the standard library. This also includes Python
|
||||
wrappers for lots of Mac OS X API's.
|
||||
interpreter and the standard library.
|
||||
""",
|
||||
postflight="scripts/postflight.framework",
|
||||
selected='selected',
|
||||
|
|
@ -483,24 +474,6 @@ def pkg_recipes():
|
|||
),
|
||||
]
|
||||
|
||||
if getDeptargetTuple() < (10, 4) and not PYTHON_3:
|
||||
result.append(
|
||||
dict(
|
||||
name="PythonSystemFixes",
|
||||
long_name="Fix system Python",
|
||||
readme="""\
|
||||
This package updates the system python installation on
|
||||
Mac OS X 10.3 to ensure that you can build new python extensions
|
||||
using that copy of python after installing this version.
|
||||
""",
|
||||
postflight="../Tools/fixapplepython23.py",
|
||||
topdir="/Library/Frameworks/Python.framework",
|
||||
source="/empty-dir",
|
||||
required=False,
|
||||
selected=unselected_for_python3,
|
||||
)
|
||||
)
|
||||
|
||||
return result
|
||||
|
||||
def fatal(msg):
|
||||
|
|
@ -565,55 +538,54 @@ def checkEnvironment():
|
|||
Check that we're running on a supported system.
|
||||
"""
|
||||
|
||||
if sys.version_info[0:2] < (2, 4):
|
||||
fatal("This script must be run with Python 2.4 or later")
|
||||
if sys.version_info[0:2] < (2, 5):
|
||||
fatal("This script must be run with Python 2.5 (or later)")
|
||||
|
||||
if platform.system() != 'Darwin':
|
||||
fatal("This script should be run on a Mac OS X 10.4 (or later) system")
|
||||
fatal("This script should be run on a macOS 10.5 (or later) system")
|
||||
|
||||
if int(platform.release().split('.')[0]) < 8:
|
||||
fatal("This script should be run on a Mac OS X 10.4 (or later) system")
|
||||
|
||||
if not os.path.exists(SDKPATH):
|
||||
fatal("Please install the latest version of Xcode and the %s SDK"%(
|
||||
os.path.basename(SDKPATH[:-4])))
|
||||
fatal("This script should be run on a macOS 10.5 (or later) system")
|
||||
|
||||
# Because we only support dynamic load of only one major/minor version of
|
||||
# Tcl/Tk, if we are not using building and using our own private copy of
|
||||
# Tcl/Tk, ensure:
|
||||
# 1. there are no user-installed frameworks of Tcl/Tk with version
|
||||
# higher than the Apple-supplied system version in
|
||||
# SDKROOT/System/Library/Frameworks
|
||||
# 2. there is a user-installed framework (usually ActiveTcl) in (or linked
|
||||
# in) SDKROOT/Library/Frameworks with the same version as the system
|
||||
# version. This allows users to choose to install a newer patch level.
|
||||
# 1. there is a user-installed framework (usually ActiveTcl) in (or linked
|
||||
# in) SDKROOT/Library/Frameworks. As of Python 3.6.5, we no longer
|
||||
# enforce that the version of the user-installed framework also
|
||||
# exists in the system-supplied Tcl/Tk frameworks. Time to support
|
||||
# Tcl/Tk 8.6 even if Apple does not.
|
||||
if not internalTk():
|
||||
frameworks = {}
|
||||
for framework in ['Tcl', 'Tk']:
|
||||
fwpth = 'Library/Frameworks/%s.framework/Versions/Current' % framework
|
||||
libfw = os.path.join('/', fwpth)
|
||||
usrfw = os.path.join(os.getenv('HOME'), fwpth)
|
||||
frameworks[framework] = os.readlink(libfw)
|
||||
if not os.path.exists(libfw):
|
||||
fatal("Please install a link to a current %s %s as %s so "
|
||||
"the user can override the system framework."
|
||||
% (framework, frameworks[framework], libfw))
|
||||
if os.path.exists(usrfw):
|
||||
fatal("Please rename %s to avoid possible dynamic load issues."
|
||||
% usrfw)
|
||||
|
||||
frameworks = {}
|
||||
for framework in ['Tcl', 'Tk']:
|
||||
fwpth = 'Library/Frameworks/%s.framework/Versions/Current' % framework
|
||||
sysfw = os.path.join(SDKPATH, 'System', fwpth)
|
||||
libfw = os.path.join(SDKPATH, fwpth)
|
||||
usrfw = os.path.join(os.getenv('HOME'), fwpth)
|
||||
frameworks[framework] = os.readlink(sysfw)
|
||||
if not os.path.exists(libfw):
|
||||
fatal("Please install a link to a current %s %s as %s so "
|
||||
"the user can override the system framework."
|
||||
% (framework, frameworks[framework], libfw))
|
||||
if os.readlink(libfw) != os.readlink(sysfw):
|
||||
fatal("Version of %s must match %s" % (libfw, sysfw) )
|
||||
if os.path.exists(usrfw):
|
||||
fatal("Please rename %s to avoid possible dynamic load issues."
|
||||
% usrfw)
|
||||
if frameworks['Tcl'] != frameworks['Tk']:
|
||||
fatal("The Tcl and Tk frameworks are not the same version.")
|
||||
|
||||
if frameworks['Tcl'] != frameworks['Tk']:
|
||||
fatal("The Tcl and Tk frameworks are not the same version.")
|
||||
print(" -- Building with external Tcl/Tk %s frameworks"
|
||||
% frameworks['Tk'])
|
||||
|
||||
# add files to check after build
|
||||
EXPECTED_SHARED_LIBS['_tkinter.so'] = [
|
||||
"/Library/Frameworks/Tcl.framework/Versions/%s/Tcl"
|
||||
% frameworks['Tcl'],
|
||||
"/Library/Frameworks/Tk.framework/Versions/%s/Tk"
|
||||
% frameworks['Tk'],
|
||||
]
|
||||
# add files to check after build
|
||||
EXPECTED_SHARED_LIBS['_tkinter.so'] = [
|
||||
"/Library/Frameworks/Tcl.framework/Versions/%s/Tcl"
|
||||
% frameworks['Tcl'],
|
||||
"/Library/Frameworks/Tk.framework/Versions/%s/Tk"
|
||||
% frameworks['Tk'],
|
||||
]
|
||||
else:
|
||||
print(" -- Building private copy of Tcl/Tk")
|
||||
print("")
|
||||
|
||||
# Remove inherited environment variables which might influence build
|
||||
environ_var_prefixes = ['CPATH', 'C_INCLUDE_', 'DYLD_', 'LANG', 'LC_',
|
||||
|
|
@ -643,7 +615,7 @@ def parseOptions(args=None):
|
|||
"""
|
||||
Parse arguments and update global settings.
|
||||
"""
|
||||
global WORKDIR, DEPSRC, SDKPATH, SRCDIR, DEPTARGET
|
||||
global WORKDIR, DEPSRC, SRCDIR, DEPTARGET
|
||||
global UNIVERSALOPTS, UNIVERSALARCHS, ARCHLIST, CC, CXX
|
||||
global FW_VERSION_PREFIX
|
||||
global FW_SSL_DIRECTORY
|
||||
|
|
@ -676,7 +648,7 @@ def parseOptions(args=None):
|
|||
DEPSRC=v
|
||||
|
||||
elif k in ('--sdk-path',):
|
||||
SDKPATH=v
|
||||
print(" WARNING: --sdk-path is no longer supported")
|
||||
|
||||
elif k in ('--src-dir',):
|
||||
SRCDIR=v
|
||||
|
|
@ -692,7 +664,7 @@ def parseOptions(args=None):
|
|||
if deptarget is None:
|
||||
# Select alternate default deployment
|
||||
# target
|
||||
DEPTARGET = default_target_map.get(v, '10.3')
|
||||
DEPTARGET = default_target_map.get(v, '10.5')
|
||||
else:
|
||||
raise NotImplementedError(v)
|
||||
|
||||
|
|
@ -701,7 +673,6 @@ def parseOptions(args=None):
|
|||
|
||||
SRCDIR=os.path.abspath(SRCDIR)
|
||||
WORKDIR=os.path.abspath(WORKDIR)
|
||||
SDKPATH=os.path.abspath(SDKPATH)
|
||||
DEPSRC=os.path.abspath(DEPSRC)
|
||||
|
||||
CC, CXX = getTargetCompilers()
|
||||
|
|
@ -712,7 +683,6 @@ def parseOptions(args=None):
|
|||
print("-- Settings:")
|
||||
print(" * Source directory: %s" % SRCDIR)
|
||||
print(" * Build directory: %s" % WORKDIR)
|
||||
print(" * SDK location: %s" % SDKPATH)
|
||||
print(" * Third-party source: %s" % DEPSRC)
|
||||
print(" * Deployment target: %s" % DEPTARGET)
|
||||
print(" * Universal archs: %s" % str(ARCHLIST))
|
||||
|
|
@ -854,9 +824,9 @@ def build_universal_openssl(basedir, archList):
|
|||
configure_opts.append("no-asm")
|
||||
runCommand(" ".join(["perl", "Configure"]
|
||||
+ arch_opts[arch] + configure_opts))
|
||||
runCommand("make depend OSX_SDK=%s" % SDKPATH)
|
||||
runCommand("make all OSX_SDK=%s" % SDKPATH)
|
||||
runCommand("make install_sw OSX_SDK=%s" % SDKPATH)
|
||||
runCommand("make depend")
|
||||
runCommand("make all")
|
||||
runCommand("make install_sw")
|
||||
# runCommand("make test")
|
||||
return
|
||||
|
||||
|
|
@ -1015,27 +985,24 @@ def buildRecipe(recipe, basedir, archList):
|
|||
|
||||
if recipe.get('useLDFlags', 1):
|
||||
configure_args.extend([
|
||||
"CFLAGS=%s-mmacosx-version-min=%s -arch %s -isysroot %s "
|
||||
"CFLAGS=%s-mmacosx-version-min=%s -arch %s "
|
||||
"-I%s/usr/local/include"%(
|
||||
recipe.get('extra_cflags', ''),
|
||||
DEPTARGET,
|
||||
' -arch '.join(archList),
|
||||
shellQuote(SDKPATH)[1:-1],
|
||||
shellQuote(basedir)[1:-1],),
|
||||
"LDFLAGS=-mmacosx-version-min=%s -isysroot %s -L%s/usr/local/lib -arch %s"%(
|
||||
"LDFLAGS=-mmacosx-version-min=%s -L%s/usr/local/lib -arch %s"%(
|
||||
DEPTARGET,
|
||||
shellQuote(SDKPATH)[1:-1],
|
||||
shellQuote(basedir)[1:-1],
|
||||
' -arch '.join(archList)),
|
||||
])
|
||||
else:
|
||||
configure_args.extend([
|
||||
"CFLAGS=%s-mmacosx-version-min=%s -arch %s -isysroot %s "
|
||||
"CFLAGS=%s-mmacosx-version-min=%s -arch %s "
|
||||
"-I%s/usr/local/include"%(
|
||||
recipe.get('extra_cflags', ''),
|
||||
DEPTARGET,
|
||||
' -arch '.join(archList),
|
||||
shellQuote(SDKPATH)[1:-1],
|
||||
shellQuote(basedir)[1:-1],),
|
||||
])
|
||||
|
||||
|
|
@ -1113,10 +1080,6 @@ def buildPython():
|
|||
curdir = os.getcwd()
|
||||
os.chdir(buildDir)
|
||||
|
||||
# Not sure if this is still needed, the original build script
|
||||
# claims that parts of the install assume python.exe exists.
|
||||
os.symlink('python', os.path.join(buildDir, 'python.exe'))
|
||||
|
||||
# Extract the version from the configure file, needed to calculate
|
||||
# several paths.
|
||||
version = getVersion()
|
||||
|
|
@ -1127,16 +1090,22 @@ def buildPython():
|
|||
os.environ['DYLD_LIBRARY_PATH'] = os.path.join(WORKDIR,
|
||||
'libraries', 'usr', 'local', 'lib')
|
||||
print("Running configure...")
|
||||
runCommand("%s -C --enable-framework --enable-universalsdk=%s "
|
||||
runCommand("%s -C --enable-framework --enable-universalsdk=/ "
|
||||
"--with-universal-archs=%s "
|
||||
"%s "
|
||||
"%s "
|
||||
"%s "
|
||||
"%s "
|
||||
"LDFLAGS='-g -L%s/libraries/usr/local/lib' "
|
||||
"CFLAGS='-g -I%s/libraries/usr/local/include' 2>&1"%(
|
||||
shellQuote(os.path.join(SRCDIR, 'configure')), shellQuote(SDKPATH),
|
||||
shellQuote(os.path.join(SRCDIR, 'configure')),
|
||||
UNIVERSALARCHS,
|
||||
(' ', '--with-computed-gotos ')[PYTHON_3],
|
||||
(' ', '--without-ensurepip ')[PYTHON_3],
|
||||
(' ', "--with-tcltk-includes='-I%s/libraries/usr/local/include'"%(
|
||||
shellQuote(WORKDIR)[1:-1],))[internalTk()],
|
||||
(' ', "--with-tcltk-libs='-L%s/libraries/usr/local/lib -ltcl8.6 -ltk8.6'"%(
|
||||
shellQuote(WORKDIR)[1:-1],))[internalTk()],
|
||||
shellQuote(WORKDIR)[1:-1],
|
||||
shellQuote(WORKDIR)[1:-1]))
|
||||
|
||||
|
|
@ -1171,14 +1140,22 @@ def buildPython():
|
|||
del os.environ['DYLD_LIBRARY_PATH']
|
||||
print("Copying required shared libraries")
|
||||
if os.path.exists(os.path.join(WORKDIR, 'libraries', 'Library')):
|
||||
runCommand("mv %s/* %s"%(
|
||||
shellQuote(os.path.join(
|
||||
build_lib_dir = os.path.join(
|
||||
WORKDIR, 'libraries', 'Library', 'Frameworks',
|
||||
'Python.framework', 'Versions', getVersion(),
|
||||
'lib')),
|
||||
shellQuote(os.path.join(WORKDIR, '_root', 'Library', 'Frameworks',
|
||||
'Python.framework', 'Versions', getVersion(),
|
||||
'lib'))))
|
||||
'Python.framework', 'Versions', getVersion(), 'lib')
|
||||
fw_lib_dir = os.path.join(
|
||||
WORKDIR, '_root', 'Library', 'Frameworks',
|
||||
'Python.framework', 'Versions', getVersion(), 'lib')
|
||||
if internalTk():
|
||||
# move Tcl and Tk pkgconfig files
|
||||
runCommand("mv %s/pkgconfig/* %s/pkgconfig"%(
|
||||
shellQuote(build_lib_dir),
|
||||
shellQuote(fw_lib_dir) ))
|
||||
runCommand("rm -r %s/pkgconfig"%(
|
||||
shellQuote(build_lib_dir), ))
|
||||
runCommand("mv %s/* %s"%(
|
||||
shellQuote(build_lib_dir),
|
||||
shellQuote(fw_lib_dir) ))
|
||||
|
||||
frmDir = os.path.join(rootDir, 'Library', 'Frameworks', 'Python.framework')
|
||||
frmDirVersioned = os.path.join(frmDir, 'Versions', version)
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
Issue #19373: Patch to Tk 8.5.15 to correct refresh problem on OS x 10.9.
|
||||
From upstream checkin https://core.tcl.tk/tk/info/5a5abf71f9
|
||||
|
||||
--- tk8.5.15/macosx/tkMacOSXDraw.c 2013-09-16 09:41:21.000000000 -0700
|
||||
+++ Tk_Source_Code-5a5abf71f9fdb0da/macosx/tkMacOSXDraw.c 2013-10-27 13:27:00.000000000 -0700
|
||||
@@ -1688,6 +1688,7 @@
|
||||
{
|
||||
if (dcPtr->context) {
|
||||
CGContextSynchronize(dcPtr->context);
|
||||
+ [[dcPtr->view window] setViewsNeedDisplay:YES];
|
||||
[[dcPtr->view window] enableFlushWindow];
|
||||
if (dcPtr->focusLocked) {
|
||||
[dcPtr->view unlockFocus];
|
||||
|
|
@ -1,40 +0,0 @@
|
|||
# HG changeset patch
|
||||
#
|
||||
# using openssl 1.0.2k
|
||||
#
|
||||
# - support building with an OS X SDK
|
||||
|
||||
diff Configure
|
||||
|
||||
diff --git a/Configure b/Configure
|
||||
--- a/Configure
|
||||
+++ b/Configure
|
||||
@@ -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}::",
|
||||
-"darwin-ppc-cc","cc:-arch ppc -O3 -DB_ENDIAN -Wa,-force_cpusubtype_ALL::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
|
||||
-"darwin64-ppc-cc","cc:-arch ppc64 -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc64_asm}:osx64:dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
|
||||
-"darwin-i386-cc","cc:-arch i386 -O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:".eval{my $asm=$x86_asm;$asm=~s/cast\-586\.o//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
|
||||
-"debug-darwin-i386-cc","cc:-arch i386 -g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
|
||||
-"darwin64-x86_64-cc","cc:-arch x86_64 -O3 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:".eval{my $asm=$x86_64_asm;$asm=~s/rc4\-[^:]+//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
|
||||
-"debug-darwin64-x86_64-cc","cc:-arch x86_64 -ggdb -g2 -O0 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:".eval{my $asm=$x86_64_asm;$asm=~s/rc4\-[^:]+//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
|
||||
+"darwin-ppc-cc","cc:-arch ppc -isysroot \$(OSX_SDK) -O3 -DB_ENDIAN -Wa,-force_cpusubtype_ALL::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc32_asm}:osx32:dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
|
||||
+"darwin64-ppc-cc","cc:-arch ppc64 -isysroot \$(OSX_SDK) -O3 -DB_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${ppc64_asm}:osx64:dlfcn:darwin-shared:-fPIC -fno-common:-arch ppc64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
|
||||
+"darwin-i386-cc","cc:-arch i386 -isysroot \$(OSX_SDK) -O3 -fomit-frame-pointer -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:".eval{my $asm=$x86_asm;$asm=~s/cast\-586\.o//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
|
||||
+"debug-darwin-i386-cc","cc:-arch i386 -isysroot \$(OSX_SDK) -g3 -DL_ENDIAN::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:BN_LLONG RC4_INT RC4_CHUNK DES_UNROLL BF_PTR:${x86_asm}:macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch i386 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
|
||||
+"darwin64-x86_64-cc","cc:-arch x86_64 -isysroot \$(OSX_SDK) -O3 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:".eval{my $asm=$x86_64_asm;$asm=~s/rc4\-[^:]+//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
|
||||
+"debug-darwin64-x86_64-cc","cc:-arch x86_64 -isysroot \$(OSX_SDK) -ggdb -g2 -O0 -DL_ENDIAN -Wall::-D_REENTRANT:MACOSX:-Wl,-search_paths_first%:SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_UNROLL:".eval{my $asm=$x86_64_asm;$asm=~s/rc4\-[^:]+//;$asm}.":macosx:dlfcn:darwin-shared:-fPIC -fno-common:-arch x86_64 -dynamiclib:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
|
||||
"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",
|
||||
@@ -1728,8 +1728,7 @@
|
||||
s/^AR=\s*ar/AR= $ar/;
|
||||
s/^RANLIB=.*/RANLIB= $ranlib/;
|
||||
s/^RC=.*/RC= $windres/;
|
||||
- s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $cc eq "gcc";
|
||||
- s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/ if $ecc eq "gcc" || $ecc eq "clang";
|
||||
+ s/^MAKEDEPPROG=.*$/MAKEDEPPROG= $cc/;
|
||||
}
|
||||
s/^CFLAG=.*$/CFLAG= $cflags/;
|
||||
s/^DEPFLAG=.*$/DEPFLAG=$depflags/;
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
{\rtf1\ansi\ansicpg1252\cocoartf1561\cocoasubrtf200
|
||||
{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fnil\fcharset0 LucidaGrande-Bold;\f2\fnil\fcharset0 LucidaGrande;
|
||||
\f3\fnil\fcharset0 Monaco;}
|
||||
{\colortbl;\red255\green255\blue255;}
|
||||
{\*\expandedcolortbl;;}
|
||||
\margl1440\margr1440\vieww10540\viewh8400\viewkind0
|
||||
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
|
||||
|
||||
\f0\fs28 \cf0 Congratulations!
|
||||
\fs24
|
||||
\f1\b\fs28 Python $FULL_VERSION for macOS $MACOSX_DEPLOYMENT_TARGET
|
||||
\f2\b0 was successfully installed.
|
||||
\fs24 \
|
||||
\
|
||||
One more thing: to verify the identity of secure network connections, this Python needs a set of SSL root certificates. You can download and install a current curated set from {\field{\*\fldinst{HYPERLINK "https://pypi.org/project/certifi/"}}{\fldrslt the Certifi project}} by double-clicking on the
|
||||
\f3 Install Certificates
|
||||
\f2 icon in {\field{\*\fldinst{HYPERLINK "file://localhost/Applications/Python%20$VERSION/"}}{\fldrslt the Finder window}}. See {\field{\*\fldinst{HYPERLINK "file://localhost/Applications/Python%20$VERSION/ReadMe.rtf"}}{\fldrslt the
|
||||
\f3 ReadMe
|
||||
\f2 file}} for more information.\
|
||||
}
|
||||
|
|
@ -1,43 +1,44 @@
|
|||
{\rtf1\ansi\ansicpg1252\cocoartf1504\cocoasubrtf750
|
||||
{\rtf1\ansi\ansicpg1252\cocoartf1561\cocoasubrtf200
|
||||
{\fonttbl\f0\fswiss\fcharset0 Helvetica;\f1\fmodern\fcharset0 CourierNewPSMT;}
|
||||
{\colortbl;\red255\green255\blue255;}
|
||||
{\*\expandedcolortbl;;}
|
||||
\margl1440\margr1440\vieww13380\viewh14600\viewkind0
|
||||
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
|
||||
|
||||
\f0\fs24 \cf0 This package will install Python $FULL_VERSION for Mac OS X $MACOSX_DEPLOYMENT_TARGET for the following architecture(s): $ARCHITECTURES.\
|
||||
\f0\fs24 \cf0 This package will install Python $FULL_VERSION for macOS $MACOSX_DEPLOYMENT_TARGET for the following architecture(s): $ARCHITECTURES.\
|
||||
\
|
||||
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
|
||||
|
||||
\b \cf0 \ul \ulc0 Which installer variant should I use?
|
||||
\b \cf0 \ul \ulc0 Which installer variant should I use? [CHANGED in 3.6.5]
|
||||
\b0 \ulnone \
|
||||
\
|
||||
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
|
||||
|
||||
\b \cf0 **NEW**
|
||||
\b0 For Python 3.6, the python.org website now provides only one installer variant for download: one that installs a
|
||||
\b0 With Python 3.6.5, the python.org website now provides two installer variants for download: one that installs a
|
||||
\i 64-bit-only
|
||||
\i0 Python capable of running on
|
||||
\i macOS 10.9 (Mavericks)
|
||||
\i0 or later; and one that installs a
|
||||
\i 64-bit/32-bit Intel
|
||||
\i0 Python capable of running on
|
||||
\i Mac OS X 10.6 (Snow Leopard)
|
||||
\i0 or later. This ReadMe was installed with the
|
||||
\i macOS 10.6 (Snow Leopard)
|
||||
\i0 or later. (This ReadMe was installed with the
|
||||
\i $MACOSX_DEPLOYMENT_TARGET
|
||||
\i0 variant. By default, Python will automatically run in 64-bit mode if your system supports it. The Python installed by this installer is built with private copies of some third-party libraries not included with or newer than those in OS X itself. The list of these libraries is included at the end of the License.rtf file.
|
||||
\b \ul \
|
||||
\
|
||||
\i0 variant.) Previous Python 3.6.x releases only provided the 10.6 or later installer. If you are running on macOS 10.9 or later and if you have no need for compatibility with older systems, use the 10.9 variant. Use the 10.6 variant if you are running on macOS 10.6 through 10.8, if you need to maintain compatibility with previous 3.6.x releases, or if you want to produce standalone applications that can run on systems from 10.6. The Pythons installed by these installers are built with private copies of some third-party libraries not included with or newer than those in macOS itself. The list of these libraries varies by installer variant and is included at the end of the License.rtf file.\
|
||||
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
|
||||
|
||||
\b \cf0 \ul \ulc0 \
|
||||
Certificate verification and OpenSSL\
|
||||
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
|
||||
|
||||
\b0 \cf0 \ulnone \
|
||||
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
|
||||
|
||||
\b \cf0 **NEW**
|
||||
\b0 This variant of Python 3.6 now includes its own private copy of OpenSSL 1.0.2. Unlike previous releases, the deprecated Apple-supplied OpenSSL libraries are no longer used. This also means that the trust certificates in system and user keychains managed by the
|
||||
\b0 \ulnone \
|
||||
This variant of Python 3.6 now includes its own private copy of OpenSSL 1.0.2. Unlike previous releases, the deprecated Apple-supplied OpenSSL libraries are no longer used. This also means that the trust certificates in system and user keychains managed by the
|
||||
\i Keychain Access
|
||||
\i0 application and the
|
||||
\i security
|
||||
\i0 command line utility are no longer used as defaults by the Python
|
||||
\f1 ssl
|
||||
\f0 module. For 3.6.0, a sample command script is included in
|
||||
\f0 module. A sample command script is included in
|
||||
\f1 /Applications/Python 3.6
|
||||
\f0 to install a curated bundle of default root certificates from the third-party
|
||||
\f1 certifi
|
||||
|
|
@ -49,16 +50,17 @@ The bundled
|
|||
\f1 pip
|
||||
\f0 included with the Python 3.6 installer has its own default certificate store for verifying download connections.\
|
||||
\
|
||||
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
|
||||
|
||||
\b \cf0 \ul Update your version of Tcl/Tk to use IDLE or other Tk applications
|
||||
\b \ul Using IDLE or other Tk applications [NEW/CHANGED in 3.6.5]
|
||||
\b0 \ulnone \
|
||||
\
|
||||
To use IDLE or other programs that use the Tkinter graphical user interface toolkit, you need to install a newer third-party version of the
|
||||
The 10.9+ installer variant comes with its own private version of Tcl/Tk 8.6. It does not use system-supplied or third-party supplied versions of Tcl/Tk.\
|
||||
\
|
||||
For the 10.6+ variant, you continue to need to install a newer third-party version of the
|
||||
\i Tcl/Tk
|
||||
\i0 frameworks. Visit {\field{\*\fldinst{HYPERLINK "https://www.python.org/download/mac/tcltk/"}}{\fldrslt https://www.python.org/download/mac/tcltk/}} for current information about supported and recommended versions of
|
||||
\i0 8.5 (not 8.6) frameworks to use IDLE or other programs that use the Tkinter graphical user interface toolkit. Visit {\field{\*\fldinst{HYPERLINK "https://www.python.org/download/mac/tcltk/"}}{\fldrslt https://www.python.org/download/mac/tcltk/}} for current information about supported and recommended versions of
|
||||
\i Tcl/Tk
|
||||
\i0 for this version of Python and of Mac OS X. For the initial release of Python 3.6, the installer is still linked with Tcl/Tk 8.5.\
|
||||
\i0 for this version of Python and of macOS.\
|
||||
|
||||
\b \ul \
|
||||
Other changes\
|
||||
|
|
|
|||
|
|
@ -1,34 +1,24 @@
|
|||
{\rtf1\ansi\ansicpg1252\cocoartf1504
|
||||
{\rtf1\ansi\ansicpg1252\cocoartf1561\cocoasubrtf200
|
||||
\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
|
||||
{\colortbl;\red255\green255\blue255;}
|
||||
{\*\expandedcolortbl;\csgray\c100000;}
|
||||
{\*\expandedcolortbl;;}
|
||||
\paperw11905\paperh16837\margl1440\margr1440\vieww12200\viewh10880\viewkind0
|
||||
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\partightenfactor0
|
||||
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural\partightenfactor0
|
||||
|
||||
\f0\fs24 \cf0 This package will install
|
||||
\b Python $FULL_VERSION
|
||||
\b0 for
|
||||
\b Mac OS X $MACOSX_DEPLOYMENT_TARGET
|
||||
\b macOS $MACOSX_DEPLOYMENT_TARGET
|
||||
\b0 .\
|
||||
\
|
||||
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\partightenfactor0
|
||||
\cf0 \
|
||||
|
||||
\b Python for Mac OS X
|
||||
\b0 consists of the Python programming language interpreter, plus a set of programs to allow easy access to it for Mac OS X users including an integrated development environment
|
||||
\b Python for macOS
|
||||
\b0 consists of the Python programming language interpreter, plus a set of programs to allow easy access to it for macOS users including an integrated development environment
|
||||
\b IDLE
|
||||
\b0 .\
|
||||
\
|
||||
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\partightenfactor0
|
||||
|
||||
\b \cf0 NEW:
|
||||
\b0 There are important changes in this release regarding network security and trust certificates. Please see the ReadMe for more details.\
|
||||
\
|
||||
\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\partightenfactor0
|
||||
|
||||
\b \cf0 IMPORTANT:
|
||||
\b0
|
||||
\b IDLE
|
||||
\b0 and other programs using the
|
||||
\b tkinter
|
||||
\b0 graphical user interface toolkit require specific versions of the
|
||||
\b Tcl/Tk
|
||||
\b0 platform independent windowing toolkit. Visit {\field{\*\fldinst{HYPERLINK "https://www.python.org/download/mac/tcltk/"}}{\fldrslt https://www.python.org/download/mac/tcltk/}} for current information on supported and recommended versions of Tcl/Tk for this version of Python and Mac OS X.}
|
||||
\b NEW in 3.6.5:
|
||||
\b0 two installer variants (10.9+ 64-bit-only, 10.6+ 64-/32-bit), built-in Tcl/Tk 8.6 support in the 10.9+ variant (no additional third-party downloads!)\
|
||||
}
|
||||
|
|
@ -12,6 +12,7 @@ SHARE_DOCDIR_TO_FWK="../../.."
|
|||
# make link in /Applications/Python m.n/ for Finder users
|
||||
if [ -d "${APPDIR}" ]; then
|
||||
ln -fhs "${FWK_DOCDIR}/index.html" "${APPDIR}/Python Documentation.html"
|
||||
open "${APPDIR}" || true # open the applications folder
|
||||
fi
|
||||
|
||||
# make share/doc link in framework for command line users
|
||||
|
|
|
|||
|
|
@ -0,0 +1,18 @@
|
|||
Fix build failure with +quartz variant on OS X 10.8 and 10.9.
|
||||
Even though Gestalt was deprecated in OS X 10.8, it should work fine
|
||||
through OS X 10.9, and its replacement NSOperatingSystemVersion was
|
||||
not introduced until OS X 10.10.
|
||||
|
||||
Patch from MacPorts project and reported upstream:
|
||||
https://trac.macports.org/ticket/55649
|
||||
--- tk8.6.8/macosx/tkMacOSXXStubs.c.orig 2017-12-06 09:25:08.000000000 -0600
|
||||
+++ tk8.6.8-patched/macosx/tkMacOSXXStubs.c 2018-01-06 19:34:17.000000000 -0600
|
||||
@@ -175,7 +175,7 @@
|
||||
{
|
||||
int major, minor, patch;
|
||||
|
||||
-#if MAC_OS_X_VERSION_MIN_REQUIRED < 1080
|
||||
+#if MAC_OS_X_VERSION_MIN_REQUIRED < 101000
|
||||
Gestalt(gestaltSystemVersionMajor, (SInt32*)&major);
|
||||
Gestalt(gestaltSystemVersionMinor, (SInt32*)&minor);
|
||||
Gestalt(gestaltSystemVersionBugFix, (SInt32*)&patch);
|
||||
|
|
@ -0,0 +1,4 @@
|
|||
Provide an additional, more modern macOS installer variant that supports
|
||||
macOS 10.9+ systems in 64-bit mode only. Upgrade the supplied third-party
|
||||
libraries to OpenSSL 1.0.2n, XZ 5.2.3, and SQLite 3.22.0. The 10.9+
|
||||
installer now links with and supplies its own copy of Tcl/Tk 8.6.8.
|
||||
|
|
@ -1491,7 +1491,8 @@ Optional Packages:
|
|||
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
|
||||
--with-universal-archs=ARCH
|
||||
select architectures for universal build ("32-bit",
|
||||
"64-bit", "3-way", "intel", "intel-32", or "all")
|
||||
"64-bit", "3-way", "intel", "intel-32", "intel-64",
|
||||
or "all")
|
||||
--with-framework-name=FRAMEWORK
|
||||
specify an alternate name of the framework built
|
||||
with --enable-framework
|
||||
|
|
@ -7345,6 +7346,11 @@ $as_echo "$CC" >&6; }
|
|||
LIPO_32BIT_FLAGS=""
|
||||
ARCH_RUN_32BIT=""
|
||||
;;
|
||||
intel-64)
|
||||
UNIVERSAL_ARCH_FLAGS="-arch x86_64"
|
||||
LIPO_32BIT_FLAGS=""
|
||||
ARCH_RUN_32BIT="true"
|
||||
;;
|
||||
3-way)
|
||||
UNIVERSAL_ARCH_FLAGS="-arch i386 -arch ppc -arch x86_64"
|
||||
LIPO_32BIT_FLAGS="-extract ppc7400 -extract i386"
|
||||
|
|
@ -7355,11 +7361,14 @@ $as_echo "$CC" >&6; }
|
|||
;;
|
||||
esac
|
||||
|
||||
CFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${CFLAGS}"
|
||||
LDFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${LDFLAGS}"
|
||||
if test "${UNIVERSALSDK}" != "/"
|
||||
then
|
||||
CFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${CFLAGS}"
|
||||
LDFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${LDFLAGS}"
|
||||
CPPFLAGS="-isysroot ${UNIVERSALSDK} ${CPPFLAGS}"
|
||||
else
|
||||
CFLAGS="${UNIVERSAL_ARCH_FLAGS} ${CFLAGS}"
|
||||
LDFLAGS="${UNIVERSAL_ARCH_FLAGS} ${LDFLAGS}"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
|
|||
14
configure.ac
14
configure.ac
|
|
@ -214,7 +214,7 @@ fi
|
|||
AC_SUBST(LIPO_32BIT_FLAGS)
|
||||
AC_MSG_CHECKING(for --with-universal-archs)
|
||||
AC_ARG_WITH(universal-archs,
|
||||
AS_HELP_STRING([--with-universal-archs=ARCH], [select architectures for universal build ("32-bit", "64-bit", "3-way", "intel", "intel-32", or "all")]),
|
||||
AS_HELP_STRING([--with-universal-archs=ARCH], [select architectures for universal build ("32-bit", "64-bit", "3-way", "intel", "intel-32", "intel-64", or "all")]),
|
||||
[
|
||||
UNIVERSAL_ARCHS="$withval"
|
||||
],
|
||||
|
|
@ -1782,6 +1782,11 @@ yes)
|
|||
LIPO_32BIT_FLAGS=""
|
||||
ARCH_RUN_32BIT=""
|
||||
;;
|
||||
intel-64)
|
||||
UNIVERSAL_ARCH_FLAGS="-arch x86_64"
|
||||
LIPO_32BIT_FLAGS=""
|
||||
ARCH_RUN_32BIT="true"
|
||||
;;
|
||||
3-way)
|
||||
UNIVERSAL_ARCH_FLAGS="-arch i386 -arch ppc -arch x86_64"
|
||||
LIPO_32BIT_FLAGS="-extract ppc7400 -extract i386"
|
||||
|
|
@ -1792,11 +1797,14 @@ yes)
|
|||
;;
|
||||
esac
|
||||
|
||||
CFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${CFLAGS}"
|
||||
LDFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${LDFLAGS}"
|
||||
if test "${UNIVERSALSDK}" != "/"
|
||||
then
|
||||
CFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${CFLAGS}"
|
||||
LDFLAGS="${UNIVERSAL_ARCH_FLAGS} -isysroot ${UNIVERSALSDK} ${LDFLAGS}"
|
||||
CPPFLAGS="-isysroot ${UNIVERSALSDK} ${CPPFLAGS}"
|
||||
else
|
||||
CFLAGS="${UNIVERSAL_ARCH_FLAGS} ${CFLAGS}"
|
||||
LDFLAGS="${UNIVERSAL_ARCH_FLAGS} ${LDFLAGS}"
|
||||
fi
|
||||
fi
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue