summaryrefslogtreecommitdiffstats
path: root/PCbuild
diff options
context:
space:
mode:
authorZachary Ware <zachary.ware@gmail.com>2015-07-16 04:33:15 (GMT)
committerZachary Ware <zachary.ware@gmail.com>2015-07-16 04:33:15 (GMT)
commit10c997ae9c522e323fe430ef67507376fad835b3 (patch)
tree56008ac6b2dfa446cf2c61a224e536b0c55b598a /PCbuild
parent79d0e724e3a0bc78ea7fe34fb77a075841d67fc5 (diff)
downloadcpython-10c997ae9c522e323fe430ef67507376fad835b3.zip
cpython-10c997ae9c522e323fe430ef67507376fad835b3.tar.gz
cpython-10c997ae9c522e323fe430ef67507376fad835b3.tar.bz2
Close #23963: Fix building with original OpenSSL sources.
Backport of bcf93e3766e8.
Diffstat (limited to 'PCbuild')
-rw-r--r--PCbuild/build_ssl.py13
1 files changed, 5 insertions, 8 deletions
diff --git a/PCbuild/build_ssl.py b/PCbuild/build_ssl.py
index dd8bb18..bda9c81 100644
--- a/PCbuild/build_ssl.py
+++ b/PCbuild/build_ssl.py
@@ -24,6 +24,7 @@ from __future__ import with_statement, print_function
# python.exe build_ssl.py Release x64
# python.exe build_ssl.py Release Win32
+from __future__ import with_statement
import os, sys, re, shutil
# Find all "foo.exe" files on the PATH.
@@ -98,13 +99,10 @@ def fix_makefile(makefile):
"""
if not os.path.isfile(makefile):
return
- # 2.4 compatibility
fin = open(makefile)
- if 1: # with open(makefile) as fin:
+ with open(makefile) as fin:
lines = fin.readlines()
- fin.close()
- fout = open(makefile, 'w')
- if 1: # with open(makefile, 'w') as fout:
+ with open(makefile, 'w') as fout:
for line in lines:
if line.startswith("PERL="):
continue
@@ -120,11 +118,10 @@ def fix_makefile(makefile):
line = line + noalgo
line = line + '\n'
fout.write(line)
- fout.close()
def run_configure(configure, do_script):
- print("perl Configure "+configure)
- os.system("perl Configure "+configure)
+ print("perl Configure "+configure+" no-idea no-mdc2")
+ os.system("perl Configure "+configure+" no-idea no-mdc2")
print(do_script)
os.system(do_script)