Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
947f411b
Commit
947f411b
authored
Mar 08, 2016
by
Steve Dower
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #26465: Update Windows builds to use OpenSSL 1.0.2g.
parent
cc2dbc58
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
4 deletions
+6
-4
Misc/NEWS
Misc/NEWS
+2
-0
PCbuild/get_externals.bat
PCbuild/get_externals.bat
+1
-1
PCbuild/prepare_ssl.bat
PCbuild/prepare_ssl.bat
+2
-2
PCbuild/python.props
PCbuild/python.props
+1
-1
No files found.
Misc/NEWS
View file @
947f411b
...
...
@@ -294,6 +294,8 @@ Tests
Build
-----
-
Issue
#
26465
:
Update
Windows
builds
to
use
OpenSSL
1.0.2
g
.
-
Issue
#
24421
:
Compile
Modules
/
_math
.
c
once
,
before
building
extensions
.
Previously
it
could
fail
to
compile
properly
if
the
math
and
cmath
builds
were
concurrent
.
...
...
PCbuild/get_externals.bat
View file @
947f411b
...
...
@@ -54,7 +54,7 @@ echo.Fetching external libraries...
set
libraries
=
set
libraries
=
%libraries%
bzip2
-
1
.0.6
if
NOT
"
%IncludeSSL%
"
==
"false"
set
libraries
=
%libraries%
nasm
-
2
.11.06
if
NOT
"
%IncludeSSL%
"
==
"false"
set
libraries
=
%libraries%
openssl
-
1
.0.2
f
if
NOT
"
%IncludeSSL%
"
==
"false"
set
libraries
=
%libraries%
openssl
-
1
.0.2
g
set
libraries
=
%libraries%
sqlite
-
3
.8.11.0
if
NOT
"
%IncludeTkinter%
"
==
"false"
set
libraries
=
%libraries%
tcl
-core
-
8
.6.4.2
if
NOT
"
%IncludeTkinter%
"
==
"false"
set
libraries
=
%libraries%
tk
-
8
.6.4.2
...
...
PCbuild/prepare_ssl.bat
View file @
947f411b
@echo
off
if
not
defined
HOST_PYTHON
(
if
%
1
EQU
Debug
(
if
"
%
1"
EQU
"Debug"
(
shift
set
HOST_PYTHON
=
python_d
.exe
if
not
exist
python35_d
.dll
exit
1
...
...
@@ -9,4 +9,4 @@ if not defined HOST_PYTHON (
if
not
exist
python35
.dll
exit
1
)
)
%HOST_PYTHON%
prepare_ssl
.py
%
1
%HOST_PYTHON%
"
%~dp0
prepare_ssl.py"
%
1
PCbuild/python.props
View file @
947f411b
...
...
@@ -41,7 +41,7 @@
<sqlite3Dir>
$(ExternalsDir)sqlite-3.8.11.0\
</sqlite3Dir>
<bz2Dir>
$(ExternalsDir)bzip2-1.0.6\
</bz2Dir>
<lzmaDir>
$(ExternalsDir)xz-5.0.5\
</lzmaDir>
<opensslDir>
$(ExternalsDir)openssl-1.0.2
f
\
</opensslDir>
<opensslDir>
$(ExternalsDir)openssl-1.0.2
g
\
</opensslDir>
<opensslIncludeDir>
$(opensslDir)include32
</opensslIncludeDir>
<opensslIncludeDir
Condition=
"'$(ArchName)' == 'amd64'"
>
$(opensslDir)include64
</opensslIncludeDir>
<nasmDir>
$(ExternalsDir)\nasm-2.11.06\
</nasmDir>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment