diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2012-11-30 01:12:12 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-11-30 01:21:09 +0200 |
| commit | 38fed61f63d4f4078a51916acd8ebd34b9e3f695 (patch) | |
| tree | 37f1338de42e7b66b14a92fa36addb77057517af /python3 | |
| parent | 28327c28ced32f181ed9b5c4921fd844e549980d (diff) | |
Kill the ProjectReference to ssl.vcxproj, too
Otherwise it would try to build the ssl.vcxproj which we don't want
(because we want to use the openSSL already built from solver), and
which fails anyway because for some reason it wants to run
python_d.exe.
Change-Id: I7471bc26ae96be84b976ba35bb959d75678df980
Diffstat (limited to 'python3')
| -rw-r--r-- | python3/python-3.3.0-ssl.patch.1 | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/python3/python-3.3.0-ssl.patch.1 b/python3/python-3.3.0-ssl.patch.1 index b7ba5b5c00e0..852da8d572d3 100644 --- a/python3/python-3.3.0-ssl.patch.1 +++ b/python3/python-3.3.0-ssl.patch.1 @@ -1,3 +1,5 @@ +-*- Mode: diff -*- + Tweak SSL build to find OpenSSL in solver & not build it itself in "ssl.vcproj" etc. diff -ru python3.old_/Modules/Setup.dist python3/Modules/Setup.dist @@ -327,6 +329,17 @@ diff -ru python3.old_/PCbuild/_ssl.vcxproj python3/PCbuild/_ssl.vcxproj <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> +@@ -271,10 +271,6 @@ + <Project>{cf7ac3d1-e2df-41d2-bea6-1e2556cdea26}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> + </ProjectReference> +- <ProjectReference Include="ssl.vcxproj"> +- <Project>{e5b04cc0-eb4c-42ab-b4dc-18ef95f864b0}</Project> +- <ReferenceOutputAssembly>false</ReferenceOutputAssembly> +- </ProjectReference> + <ProjectReference Include="_socket.vcxproj"> + <Project>{86937f53-c189-40ef-8ce8-8759d8e7d480}</Project> + <ReferenceOutputAssembly>false</ReferenceOutputAssembly> diff -ru python3.old_/setup.py python3/setup.py --- python3.old_/setup.py 2012-09-29 10:00:50.000000000 +0200 +++ python3/setup.py 2012-11-13 14:18:23.484158149 +0100 |