Issue #26465: Update Windows builds to use OpenSSL 1.0.2g.
This commit is contained in:
commit
43cbd05b6c
|
@ -793,6 +793,8 @@ Tests
|
|||
Build
|
||||
-----
|
||||
|
||||
- Issue #26465: Update Windows builds to use OpenSSL 1.0.2g.
|
||||
|
||||
- Issue #25348: Added ``--pgo`` and ``--pgo-job`` arguments to
|
||||
``PCbuild\build.bat`` for building with Profile-Guided Optimization. The
|
||||
old ``PCbuild\build_pgo.bat`` script is removed.
|
||||
|
|
|
@ -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.2f
|
||||
if NOT "%IncludeSSL%"=="false" set libraries=%libraries% openssl-1.0.2g
|
||||
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
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
@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 python36_d.dll exit 1
|
||||
|
@ -9,4 +9,4 @@ if not defined HOST_PYTHON (
|
|||
if not exist python36.dll exit 1
|
||||
)
|
||||
)
|
||||
%HOST_PYTHON% prepare_ssl.py %1
|
||||
%HOST_PYTHON% "%~dp0prepare_ssl.py" %1
|
||||
|
|
|
@ -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.2f\</opensslDir>
|
||||
<opensslDir>$(ExternalsDir)openssl-1.0.2g\</opensslDir>
|
||||
<opensslIncludeDir>$(opensslDir)include32</opensslIncludeDir>
|
||||
<opensslIncludeDir Condition="'$(ArchName)' == 'amd64'">$(opensslDir)include64</opensslIncludeDir>
|
||||
<nasmDir>$(ExternalsDir)\nasm-2.11.06\</nasmDir>
|
||||
|
|
Loading…
Reference in New Issue