[Python-checkins] cpython: Fix prepare_ssl.py for OpenSSL 1.0.2a builds without Perl (using old system).

zach.ware python-checkins at python.org
Thu Apr 9 21:46:31 CEST 2015


https://hg.python.org/cpython/rev/6578b978a39e
changeset:   95498:6578b978a39e
parent:      95495:bff88c866886
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Tue Apr 07 20:38:53 2015 -0500
summary:
  Fix prepare_ssl.py for OpenSSL 1.0.2a builds without Perl (using old system).

This change affects the makefiles checked into svn.python.org, which the 3.5
build no longer uses.  3.4 and 2.7 both still use those makefiles, but their
build_ssl.py scripts don't require an update; if the script is running the
'fix_makefiles' method it already has Perl available anyway.

files:
  PCbuild/prepare_ssl.py |  3 +++
  1 files changed, 3 insertions(+), 0 deletions(-)


diff --git a/PCbuild/prepare_ssl.py b/PCbuild/prepare_ssl.py
--- a/PCbuild/prepare_ssl.py
+++ b/PCbuild/prepare_ssl.py
@@ -132,6 +132,9 @@
                     if noalgo not in line:
                         line = line + noalgo
                 line = line + '\n'
+            if r'$(SRC_D)\util\copy-if-different.pl' in line:
+                line = line.replace(r'$(SRC_D)\util\copy-if-different.pl',
+                                    'copy /Y')
             fout.write(line)
 
 def run_configure(configure, do_script):

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


More information about the Python-checkins mailing list