From e470d092cb8ea1fc6a3d528f40799dca9cf86f17 Mon Sep 17 00:00:00 2001 From: Zachary Ware Date: Sat, 1 Nov 2014 18:42:46 -0500 Subject: [PATCH] Issue #17717: Pull NASM from svn.python.org for OpenSSL build. --- Misc/NEWS | 3 +++ PCbuild/get_externals.bat | 8 +++++--- PCbuild/pyproject.props | 4 ++++ PCbuild/readme.txt | 8 ++++---- PCbuild/ssl.vcxproj | 8 ++++++++ 5 files changed, 24 insertions(+), 7 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS index b90a9b09d3e..c47b3ff50a9 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -1383,6 +1383,9 @@ Tools/Demos Windows ------- +- Issue #17717: The Windows build scripts now use a copy of NASM pulled from + svn.python.org to build OpenSSL. + - Issue #21907: Improved the batch scripts provided for building Python. - Issue #22644: The bundled version of OpenSSL has been updated to 1.0.1j. diff --git a/PCbuild/get_externals.bat b/PCbuild/get_externals.bat index 84360517f80..662bfcfa9a3 100644 --- a/PCbuild/get_externals.bat +++ b/PCbuild/get_externals.bat @@ -20,6 +20,7 @@ echo.Cleaning up external libraries. for /D %%d in ( bzip2-* db-* + nasm-* openssl-* tcl-* tcltk* @@ -51,6 +52,7 @@ echo.Fetching external libraries... for %%e in ( bzip2-1.0.6 + nasm-2.11.06 openssl-1.0.1j tcl-8.6.1.0 tk-8.6.1.0 @@ -87,9 +89,9 @@ echo. echo.**WARNING**: the cleaning options unconditionally remove any directory echo.that is a child of echo. %CD% -echo.and matches wildcard patterns beginning with bzip2-, db-, openssl-, tcl-, -echo.tcltk, tk-, tix-, sqlite-, or xz-, and as such has the potential to be -echo.very destructive if you are not aware of what it is doing. Use with +echo.and matches wildcard patterns beginning with bzip2-, db-, nasm-, openssl-, +echo.tcl-, tcltk, tk-, tix-, sqlite-, or xz-, and as such has the potential +echo.to be very destructive if you are not aware of what it is doing. Use with echo.caution! popd exit /b -1 diff --git a/PCbuild/pyproject.props b/PCbuild/pyproject.props index 9f2b0e5a428..c7087cc4e0c 100644 --- a/PCbuild/pyproject.props +++ b/PCbuild/pyproject.props @@ -20,6 +20,7 @@ $(externalsDir)\sqlite-3.8.3.1 $(externalsDir)\bzip2-1.0.6 $(externalsDir)\xz-5.0.5 + $(externalsDir)\nasm-2.11.06 $(externalsDir)\openssl-1.0.1j $(externalsDir)\tcl-8.6.1.0 $(externalsDir)\tk-8.6.1.0 @@ -77,6 +78,9 @@ $(lzmaDir) + + $(nasmDir) + $(opensslDir) diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index 1b6a594c12d..535ea00a514 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -3,9 +3,8 @@ Quick Start Guide 1. Install Microsoft Visual C++ 2010 SP1, any edition. 2. Install Subversion, and make sure 'svn.exe' is on your PATH. -3. Install NASM, and make sure 'nasm.exe' is on your PATH. -4. Run "build.bat -e" to build Python in 32-bit Release configuration. -5. (Optional, but recommended) Run the test suite with "rt.bat -q". +3. Run "build.bat -e" to build Python in 32-bit Release configuration. +4. (Optional, but recommended) Run the test suite with "rt.bat -q". Building Python using Microsoft Visual C++ @@ -225,7 +224,8 @@ _ssl to be somewhere on your PATH. More recent versions of OpenSSL may need a later version of NASM. If OpenSSL's self tests don't pass, you should first try to update NASM and do a full rebuild of - OpenSSL. + OpenSSL. get_externals.py also downloads a snapshot of NASM, and the + ssl sub-project includes that version of nasm.exe on PATH. The ssl sub-project expects your OpenSSL sources to have already been configured and be ready to build. If you get your sources diff --git a/PCbuild/ssl.vcxproj b/PCbuild/ssl.vcxproj index 5f318d0fae5..f6796b65091 100644 --- a/PCbuild/ssl.vcxproj +++ b/PCbuild/ssl.vcxproj @@ -119,6 +119,7 @@ <_ProjectFileVersion>10.0.30319.1 +path %PATH%;$(SolutionDir)$(nasmDir) cd "$(SolutionDir)$(opensslDir)" copy /Y crypto\buildinf_x86.h crypto\buildinf.h copy /Y crypto\opensslconf_x86.h crypto\opensslconf.h @@ -133,6 +134,7 @@ nmake /nologo -f "ms\nt.mak" $(NMakeAssemblySearchPath) $(NMakeForcedUsingAssemblies) +path %PATH%;$(SolutionDir)$(nasmDir) cd "$(SolutionDir)$(opensslDir)" nasm -f win64 -DNEAR -Ox -g ms\\uptable.asm || echo nasm failed! && exit copy /Y crypto\buildinf_amd64.h crypto\buildinf.h @@ -148,6 +150,7 @@ nmake /nologo -f "ms\nt64.mak" $(NMakeAssemblySearchPath) $(NMakeForcedUsingAssemblies) +path %PATH%;$(SolutionDir)$(nasmDir) cd "$(SolutionDir)$(opensslDir)" copy /Y crypto\buildinf_x86.h crypto\buildinf.h copy /Y crypto\opensslconf_x86.h crypto\opensslconf.h @@ -162,6 +165,7 @@ nmake /nologo -f "ms\nt.mak" $(NMakeAssemblySearchPath) $(NMakeForcedUsingAssemblies) +path %PATH%;$(SolutionDir)$(nasmDir) cd "$(SolutionDir)$(opensslDir)" nasm -f win64 -DNEAR -Ox -g ms\\uptable.asm || echo nasm failed! && exit copy /Y crypto\buildinf_amd64.h crypto\buildinf.h @@ -177,6 +181,7 @@ nmake /nologo -f "ms\nt64.mak" $(NMakeAssemblySearchPath) $(NMakeForcedUsingAssemblies) +path %PATH%;$(SolutionDir)$(nasmDir) cd "$(SolutionDir)$(opensslDir)" copy /Y crypto\buildinf_x86.h crypto\buildinf.h copy /Y crypto\opensslconf_x86.h crypto\opensslconf.h @@ -191,6 +196,7 @@ nmake /nologo -f "ms\nt.mak" $(NMakeAssemblySearchPath) $(NMakeForcedUsingAssemblies) +path %PATH%;$(SolutionDir)$(nasmDir) cd "$(SolutionDir)$(opensslDir)" nasm -f win64 -DNEAR -Ox -g ms\\uptable.asm || echo nasm failed! && exit copy /Y crypto\buildinf_amd64.h crypto\buildinf.h @@ -206,6 +212,7 @@ nmake /nologo -f "ms\nt64.mak" $(NMakeAssemblySearchPath) $(NMakeForcedUsingAssemblies) +path %PATH%;$(SolutionDir)$(nasmDir) cd "$(SolutionDir)$(opensslDir)" copy /Y crypto\buildinf_x86.h crypto\buildinf.h copy /Y crypto\opensslconf_x86.h crypto\opensslconf.h @@ -220,6 +227,7 @@ nmake /nologo -f "ms\nt.mak" $(NMakeAssemblySearchPath) $(NMakeForcedUsingAssemblies) +path %PATH%;$(SolutionDir)$(nasmDir) cd "$(SolutionDir)$(opensslDir)" nasm -f win64 -DNEAR -Ox -g ms\\uptable.asm || echo nasm failed! && exit copy /Y crypto\buildinf_amd64.h crypto\buildinf.h