From: Ned Deily <nad@acm.org>
Date: Thu, 11 Dec 2014 23:55:42 +0000 (-0800)
Subject: Issue #23032: Fix installer build failures on OS X 10.4 Tiger
X-Git-Tag: v2.7.10rc1~273
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0be4b1ef58f7602c03f69594b84ba6908728acb2;p=python

Issue #23032: Fix installer build failures on OS X 10.4 Tiger
by disabling assembly code in the OpenSSL build.
---

diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
index 5c9b590179..6bcdcd8e7e 100755
--- a/Mac/BuildScript/build-installer.py
+++ b/Mac/BuildScript/build-installer.py
@@ -844,6 +844,11 @@ def build_universal_openssl(basedir, archList):
     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 @@ def build_universal_openssl(basedir, archList):
             "--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
index 6f4e5521f8..3f86e90873 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -57,6 +57,12 @@ IDLE
 - 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?
 ===========================