From: Ned Deily <nad@acm.org>
Date: Sun, 22 Jul 2012 07:46:46 +0000 (-0700)
Subject: Issue #15188: Prevent test_ldshared_value failure due to slightly
X-Git-Tag: v3.3.0b2~127
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2c80e120a95e7ce38e65cafc7e1cb2a76046c0e0;p=thirdparty%2FPython%2Fcpython.git

Issue #15188: Prevent test_ldshared_value failure due to slightly
different parsing of the Makefile by distutils.sysconfig and
sysconfig in the case when an intermediate config vars, used to
construct PY_CFLAGS or PY_LDFLAGS, has a trailing space character.
In this case, the OS X installer build script was leaving a
trailing space in the OPT and LDFLAGS config vars.  The space is not
significant and it's not worth toying with the Makefile parsing.
---

diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py
index 7891b6b21edd..69f9c8247e07 100755
--- a/Mac/BuildScript/build-installer.py
+++ b/Mac/BuildScript/build-installer.py
@@ -915,8 +915,8 @@ def buildPython():
         data = fp.read()
         fp.close()
 
-        data = data.replace('-L%s/libraries/usr/local/lib'%(WORKDIR,), '')
-        data = data.replace('-I%s/libraries/usr/local/include'%(WORKDIR,), '')
+        data = data.replace(' -L%s/libraries/usr/local/lib'%(WORKDIR,), '')
+        data = data.replace(' -I%s/libraries/usr/local/include'%(WORKDIR,), '')
         fp = open(path, 'w')
         fp.write(data)
         fp.close()