[Python-checkins] cpython (2.7): Issue #23032: Fix installer build failures on OS X 10.4 Tiger

ned.deily python-checkins at python.org
Fri Dec 12 00:56:37 CET 2014


https://hg.python.org/cpython/rev/dd677917355d
changeset:   93838:dd677917355d
branch:      2.7
parent:      93830:ce66b65ad8d6
user:        Ned Deily <nad at acm.org>
date:        Thu Dec 11 15:55:42 2014 -0800
summary:
  Issue #23032: Fix installer build failures on OS X 10.4 Tiger
by disabling assembly code in the OpenSSL build.

files:
  Mac/BuildScript/build-installer.py |  7 +++++++
  Misc/NEWS                          |  6 ++++++
  2 files changed, 13 insertions(+), 0 deletions(-)


diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
--- a/Mac/BuildScript/build-installer.py
+++ b/Mac/BuildScript/build-installer.py
@@ -844,6 +844,11 @@
     separately then lipo them together into fat libraries.
     """
 
+    # OpenSSL fails to build with Xcode 2.5 (on OS X 10.4).
+    # If we are building on a 10.4.x or earlier system,
+    # unilaterally disable assembly code building to avoid the problem.
+    no_asm = int(platform.release().split(".")[0]) < 9
+
     def build_openssl_arch(archbase, arch):
         "Build one architecture of openssl"
         arch_opts = {
@@ -868,6 +873,8 @@
             "--prefix=%s"%os.path.join("/", *FW_VERSION_PREFIX),
             "--openssldir=/System/Library/OpenSSL",
         ]
+        if no_asm:
+            configure_opts.append("no-asm")
         runCommand(" ".join(["perl", "Configure"]
                         + arch_opts[arch] + configure_opts))
         runCommand("make depend OSX_SDK=%s" % SDKPATH)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -57,6 +57,12 @@
 - Issue #16893: Update Idle doc chapter to match current Idle and add new
   information.
 
+Build
+-----
+
+- Issue #23032: Fix installer build failures on OS X 10.4 Tiger
+  by disabling assembly code in the OpenSSL build.
+
 
 What's New in Python 2.7.9?
 ===========================

-- 
Repository URL: https://hg.python.org/cpython


More information about the Python-checkins mailing list