From: Zachary Ware <zachary.ware@gmail.com>
Date: Wed, 8 Apr 2015 01:38:53 +0000 (-0500)
Subject: Fix prepare_ssl.py for OpenSSL 1.0.2a builds without Perl (using old system).
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f975b3d49976b1a5bd91dad16bd6ea6fe61d864a;p=python

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.
---

diff --git a/PCbuild/prepare_ssl.py b/PCbuild/prepare_ssl.py
index 199c4efe25..16d77d9506 100644
--- a/PCbuild/prepare_ssl.py
+++ b/PCbuild/prepare_ssl.py
@@ -132,6 +132,9 @@ def fix_makefile(makefile):
                     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):