[Python-checkins] cpython: Issue #15188: Prevent test_ldshared_value failure due to slightly

[ned.deily]

http://hg.python.org/cpython/rev/f4470babf79b
changeset:   78240:f4470babf79b
user:        Ned Deily <nad at acm.org>
date:        Sun Jul 22 00:46:46 2012 -0700
summary:
  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.

files:
  Mac/BuildScript/build-installer.py |  4 ++--
  1 files changed, 2 insertions(+), 2 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
@@ -915,8 +915,8 @@
         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()

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