FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

bpo-30368: Update build_ssl.py to restore Perl-less building (#1805) · python/cpython@ebbccea · GitHub

/ cpython Public

Commit ebbccea

Browse files
jkloth
authored and
vstinner
committed
bpo-30368: Update build_ssl.py to restore Perl-less building (#1805)
* bpo-30368: Update build_ssl.py to restore Perl-less building OpenSSL 1.0.2 releases changed how files are copied in the makefile, thus causing Perl to be required even for Python's "prepared" OpenSSL. Now build_ssl.py does the requisite copies before running nmake. * bpo-30368: Update build_ssl.py to use prepared OpenSSL * Updates SSL-linking projects to use the new include{suffix} directory * build_ssl.py now only copies those files not handled by prepare_ssl.py * * bpo-30368: Update build_ssl.py to use prepared OpenSSL * Update SSL-linking projects to use the new include{suffix} directory * Move comment to following line
1 parent d4324ba commit ebbccea

4 files changed

Lines changed: 191 additions & 198 deletions

File tree

‎PC/VS9.0/_hashlib.vcproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
/>
4444
<Tool
4545
Name="VCCLCompilerTool"
46-
AdditionalIncludeDirectories="$(opensslDir)\inc32"
46+
AdditionalIncludeDirectories="$(opensslDir)\include32"
4747
/>
4848
<Tool
4949
Name="VCManagedResourceCompilerTool"
@@ -106,7 +106,7 @@
106106
/>
107107
<Tool
108108
Name="VCCLCompilerTool"
109-
AdditionalIncludeDirectories="$(opensslDir)\inc64"
109+
AdditionalIncludeDirectories="$(opensslDir)\include64"
110110
/>
111111
<Tool
112112
Name="VCManagedResourceCompilerTool"
@@ -169,7 +169,7 @@
169169
/>
170170
<Tool
171171
Name="VCCLCompilerTool"
172-
AdditionalIncludeDirectories="$(opensslDir)\inc32"
172+
AdditionalIncludeDirectories="$(opensslDir)\include32"
173173
/>
174174
<Tool
175175
Name="VCManagedResourceCompilerTool"
@@ -233,7 +233,7 @@
233233
/>
234234
<Tool
235235
Name="VCCLCompilerTool"
236-
AdditionalIncludeDirectories="$(opensslDir)\inc64"
236+
AdditionalIncludeDirectories="$(opensslDir)\include64"
237237
/>
238238
<Tool
239239
Name="VCManagedResourceCompilerTool"
@@ -296,7 +296,7 @@
296296
/>
297297
<Tool
298298
Name="VCCLCompilerTool"
299-
AdditionalIncludeDirectories="$(opensslDir)\inc32"
299+
AdditionalIncludeDirectories="$(opensslDir)\include32"
300300
/>
301301
<Tool
302302
Name="VCManagedResourceCompilerTool"
@@ -360,7 +360,7 @@
360360
/>
361361
<Tool
362362
Name="VCCLCompilerTool"
363-
AdditionalIncludeDirectories="$(opensslDir)\inc64"
363+
AdditionalIncludeDirectories="$(opensslDir)\include64"
364364
/>
365365
<Tool
366366
Name="VCManagedResourceCompilerTool"
@@ -424,7 +424,7 @@
424424
/>
425425
<Tool
426426
Name="VCCLCompilerTool"
427-
AdditionalIncludeDirectories="$(opensslDir)\inc32"
427+
AdditionalIncludeDirectories="$(opensslDir)\include32"
428428
/>
429429
<Tool
430430
Name="VCManagedResourceCompilerTool"
@@ -488,7 +488,7 @@
488488
/>
489489
<Tool
490490
Name="VCCLCompilerTool"
491-
AdditionalIncludeDirectories="$(opensslDir)\inc64"
491+
AdditionalIncludeDirectories="$(opensslDir)\include64"
492492
/>
493493
<Tool
494494
Name="VCManagedResourceCompilerTool"

‎PC/VS9.0/_ssl.vcproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
/>
4444
<Tool
4545
Name="VCCLCompilerTool"
46-
AdditionalIncludeDirectories="$(opensslDir)\inc32"
46+
AdditionalIncludeDirectories="$(opensslDir)\include32"
4747
/>
4848
<Tool
4949
Name="VCManagedResourceCompilerTool"
@@ -106,7 +106,7 @@
106106
/>
107107
<Tool
108108
Name="VCCLCompilerTool"
109-
AdditionalIncludeDirectories="$(opensslDir)\inc64"
109+
AdditionalIncludeDirectories="$(opensslDir)\include64"
110110
/>
111111
<Tool
112112
Name="VCManagedResourceCompilerTool"
@@ -169,7 +169,7 @@
169169
/>
170170
<Tool
171171
Name="VCCLCompilerTool"
172-
AdditionalIncludeDirectories="$(opensslDir)\inc32"
172+
AdditionalIncludeDirectories="$(opensslDir)\include32"
173173
/>
174174
<Tool
175175
Name="VCManagedResourceCompilerTool"
@@ -233,7 +233,7 @@
233233
/>
234234
<Tool
235235
Name="VCCLCompilerTool"
236-
AdditionalIncludeDirectories="$(opensslDir)\inc64"
236+
AdditionalIncludeDirectories="$(opensslDir)\include64"
237237
/>
238238
<Tool
239239
Name="VCManagedResourceCompilerTool"
@@ -296,7 +296,7 @@
296296
/>
297297
<Tool
298298
Name="VCCLCompilerTool"
299-
AdditionalIncludeDirectories="$(opensslDir)\inc32"
299+
AdditionalIncludeDirectories="$(opensslDir)\include32"
300300
/>
301301
<Tool
302302
Name="VCManagedResourceCompilerTool"
@@ -360,7 +360,7 @@
360360
/>
361361
<Tool
362362
Name="VCCLCompilerTool"
363-
AdditionalIncludeDirectories="$(opensslDir)\inc64"
363+
AdditionalIncludeDirectories="$(opensslDir)\include64"
364364
/>
365365
<Tool
366366
Name="VCManagedResourceCompilerTool"
@@ -424,7 +424,7 @@
424424
/>
425425
<Tool
426426
Name="VCCLCompilerTool"
427-
AdditionalIncludeDirectories="$(opensslDir)\inc32"
427+
AdditionalIncludeDirectories="$(opensslDir)\include32"
428428
/>
429429
<Tool
430430
Name="VCManagedResourceCompilerTool"
@@ -488,7 +488,7 @@
488488
/>
489489
<Tool
490490
Name="VCCLCompilerTool"
491-
AdditionalIncludeDirectories="$(opensslDir)\inc64"
491+
AdditionalIncludeDirectories="$(opensslDir)\include64"
492492
/>
493493
<Tool
494494
Name="VCManagedResourceCompilerTool"

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL