Commit 5be6d74a authored by Martin v. Loewis's avatar Martin v. Loewis

Issue #17425: Build with openssl 1.0.0k on Windows.

parent 656c8080
...@@ -1084,6 +1084,8 @@ Tests ...@@ -1084,6 +1084,8 @@ Tests
Build Build
----- -----
- Issue #17425: Build with openssl 1.0.0k on Windows.
- Issue #16754: Fix the incorrect shared library extension on linux. Introduce - Issue #16754: Fix the incorrect shared library extension on linux. Introduce
two makefile macros SHLIB_SUFFIX and EXT_SUFFIX. SO now has the value of two makefile macros SHLIB_SUFFIX and EXT_SUFFIX. SO now has the value of
SHLIB_SUFFIX again (as in 2.x and 3.1). The SO macro is removed in 3.4. SHLIB_SUFFIX again (as in 2.x and 3.1). The SO macro is removed in 3.4.
......
...@@ -153,9 +153,9 @@ _ssl ...@@ -153,9 +153,9 @@ _ssl
Unpack into the "dist" directory, retaining the folder name from Unpack into the "dist" directory, retaining the folder name from
the archive - for example, the latest stable OpenSSL will install as the archive - for example, the latest stable OpenSSL will install as
dist/openssl-1.0.0j dist/openssl-1.0.0k
You need to use version 1.0.0j of OpenSSL. You need to use version 1.0.0k of OpenSSL.
You can install the NASM assembler from You can install the NASM assembler from
http://www.nasm.us/ http://www.nasm.us/
......
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
/> />
<UserMacro <UserMacro
Name="opensslDir" Name="opensslDir"
Value="$(externalsDir)\openssl-1.0.0j" Value="$(externalsDir)\openssl-1.0.0k"
/> />
<UserMacro <UserMacro
Name="tcltkDir" Name="tcltkDir"
......
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
/> />
<UserMacro <UserMacro
Name="opensslDir" Name="opensslDir"
Value="$(externalsDir)\openssl-1.0.0j" Value="$(externalsDir)\openssl-1.0.0k"
/> />
<UserMacro <UserMacro
Name="tcltkDir" Name="tcltkDir"
......
...@@ -139,7 +139,7 @@ _ssl ...@@ -139,7 +139,7 @@ _ssl
Get the source code through Get the source code through
svn export http://svn.python.org/projects/external/openssl-1.0.0j svn export http://svn.python.org/projects/external/openssl-1.0.0k
** NOTE: if you use the Tools\buildbot\external(-amd64).bat approach for ** NOTE: if you use the Tools\buildbot\external(-amd64).bat approach for
obtaining external sources then you don't need to manually get the source obtaining external sources then you don't need to manually get the source
......
...@@ -14,7 +14,7 @@ cd .. ...@@ -14,7 +14,7 @@ cd ..
@rem if exist tk8.4.16 rd /s/q tk8.4.16 @rem if exist tk8.4.16 rd /s/q tk8.4.16
@rem if exist tk-8.4.18.1 rd /s/q tk-8.4.18.1 @rem if exist tk-8.4.18.1 rd /s/q tk-8.4.18.1
@rem if exist db-4.4.20 rd /s/q db-4.4.20 @rem if exist db-4.4.20 rd /s/q db-4.4.20
@rem if exist openssl-1.0.0j rd /s/q openssl-1.0.0j @rem if exist openssl-1.0.0k rd /s/q openssl-1.0.0k
@rem if exist sqlite-3.7.4 rd /s/q sqlite-3.7.4 @rem if exist sqlite-3.7.4 rd /s/q sqlite-3.7.4
@rem bzip @rem bzip
...@@ -24,7 +24,7 @@ if not exist bzip2-1.0.6 ( ...@@ -24,7 +24,7 @@ if not exist bzip2-1.0.6 (
) )
@rem OpenSSL @rem OpenSSL
if not exist openssl-1.0.0j svn export http://svn.python.org/projects/external/openssl-1.0.0j if not exist openssl-1.0.0k svn export http://svn.python.org/projects/external/openssl-1.0.0k
@rem tcl/tk @rem tcl/tk
if not exist tcl-8.5.9.0 ( if not exist tcl-8.5.9.0 (
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment