From: Zachary Ware Date: Thu, 15 Jan 2015 17:16:51 +0000 (-0600) Subject: Fix up PCbuild/readme.txt a bit. X-Git-Tag: v2.7.10rc1~121 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4f3395f7eb88bfd63ad4a5f28748eacdfe4b6eb6;p=thirdparty%2FPython%2Fcpython.git Fix up PCbuild/readme.txt a bit. Removes an incorrect assertion (that the build script will choose the latest OpenSSL sources it can find), fixes NASM's homepage, and rewords the section about NASM to make it more clear that you don't have to install your own. --- diff --git a/PCbuild/readme.txt b/PCbuild/readme.txt index 4d4c7da05e35..cf6ab7f00c2e 100644 --- a/PCbuild/readme.txt +++ b/PCbuild/readme.txt @@ -138,15 +138,12 @@ _ssl obtaining external sources then you don't need to manually get the source above via subversion. ** - Alternatively, get the latest version from http://www.openssl.org. - You can (theoretically) use any version of OpenSSL you like - the - build process will automatically select the latest version. - - You must install the NASM assembler from - http://nasm.sf.net - for x86 builds. Put nasm.exe anywhere in your PATH. If you use the + The NASM assembler is required to build OpenSSL. If you use the Tools\buildbot\external(-amd64).bat method for getting sources, it also downloads a version of NASM, which the ssl build script will add to PATH. + Otherwise, you can download the NASM installer from + http://www.nasm.us/ + and add NASM to your PATH. You can also install ActivePerl from http://www.activestate.com/activeperl/