mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-17 17:46:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Upgrade to bzip2 1.0.6.

Browse source
This commit is contained in:
Martin v. Löwis 2012-05-14 14:19:09 +02:00
parent ace9261558
commit e7f67b5b98
8 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
PCbuild/bz2.vcproj
View file

@ -532,7 +532,7 @@
</File>
</Filter>
<Filter
Name="bzip2 1.0.5 Header Files"
Name="bzip2 1.0.6 Header Files"
>
<File
RelativePath="$(bz2Dir)\bzlib.h"
@ -544,7 +544,7 @@
</File>
</Filter>
<Filter
Name="bzip2 1.0.5 Source Files"
Name="bzip2 1.0.6 Source Files"
>
<File
RelativePath="$(bz2Dir)\blocksort.c"

2
PCbuild/pyproject.vsprops
View file

@ -78,7 +78,7 @@
/>
<UserMacro
Name="bz2Dir"
Value="$(externalsDir)\bzip2-1.0.5"
Value="$(externalsDir)\bzip2-1.0.6"
/>
<UserMacro
Name="opensslDir"

10
PCbuild/readme.txt
View file

@ -121,21 +121,21 @@ bz2
Download the source from the python.org copy into the dist
directory:
svn export http://svn.python.org/projects/external/bzip2-1.0.5
svn export http://svn.python.org/projects/external/bzip2-1.0.6
** 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
above via subversion. **
A custom pre-link step in the bz2 project settings should manage to
build bzip2-1.0.5\libbz2.lib by magic before bz2.pyd (or bz2_d.pyd) is
build bzip2-1.0.6\libbz2.lib by magic before bz2.pyd (or bz2_d.pyd) is
linked in PCbuild\.
However, the bz2 project is not smart enough to remove anything under
bzip2-1.0.5\ when you do a clean, so if you want to rebuild bzip2.lib
you need to clean up bzip2-1.0.5\ by hand.
bzip2-1.0.6\ when you do a clean, so if you want to rebuild bzip2.lib
you need to clean up bzip2-1.0.6\ by hand.
All of this managed to build libbz2.lib in
bzip2-1.0.5\$platform-$configuration\, which the Python project links in.
bzip2-1.0.6\$platform-$configuration\, which the Python project links in.
_ssl
Python wrapper for the secure sockets library.