diff options
Diffstat (limited to 'python/Python-ssl.patch')
| -rw-r--r-- | python/Python-ssl.patch | 162 |
1 files changed, 0 insertions, 162 deletions
diff --git a/python/Python-ssl.patch b/python/Python-ssl.patch index 5d41797c28ee..642586f31584 100644 --- a/python/Python-ssl.patch +++ b/python/Python-ssl.patch @@ -208,165 +208,3 @@ # SGI IRIX specific modules -- off by default. ---- misc/Python-2.6.1/PC/VS7.1/build_ssl.py 2007-12-31 15:59:26.000000000 +0100 -+++ misc/build/Python-2.6.1/PC/VS7.1/build_ssl.py 2010-02-16 01:43:48.872875000 +0100 -@@ -178,4 +178,4 @@ - sys.exit(rc) - - if __name__=='__main__': -- main() -+ sys.exit(0) ---- misc/Python-2.6.1/PC/VS8.0/_ssl.vcproj 2008-06-14 00:38:33.000000000 +0200 -+++ misc/build/Python-2.6.1/PC/VS8.0/_ssl.vcproj 2010-02-16 01:38:22.044750000 +0100 -@@ -43,7 +43,7 @@ - /> - <Tool - Name="VCCLCompilerTool" -- AdditionalIncludeDirectories="$(opensslDir)\inc32" -+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external" - /> - <Tool - Name="VCManagedResourceCompilerTool" -@@ -57,7 +57,7 @@ - /> - <Tool - Name="VCLinkerTool" -- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib" -+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib" - /> - <Tool - Name="VCALinkTool" -@@ -106,7 +106,7 @@ - /> - <Tool - Name="VCCLCompilerTool" -- AdditionalIncludeDirectories="$(opensslDir)\inc64" -+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external" - /> - <Tool - Name="VCManagedResourceCompilerTool" -@@ -120,7 +120,7 @@ - /> - <Tool - Name="VCLinkerTool" -- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib" -+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib" - /> - <Tool - Name="VCALinkTool" -@@ -169,7 +169,7 @@ - /> - <Tool - Name="VCCLCompilerTool" -- AdditionalIncludeDirectories="$(opensslDir)\inc32" -+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external" - /> - <Tool - Name="VCManagedResourceCompilerTool" -@@ -183,7 +183,7 @@ - /> - <Tool - Name="VCLinkerTool" -- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib" -+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib" - /> - <Tool - Name="VCALinkTool" -@@ -233,7 +233,7 @@ - /> - <Tool - Name="VCCLCompilerTool" -- AdditionalIncludeDirectories="$(opensslDir)\inc64" -+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external" - /> - <Tool - Name="VCManagedResourceCompilerTool" -@@ -247,7 +247,7 @@ - /> - <Tool - Name="VCLinkerTool" -- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib" -+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib" - /> - <Tool - Name="VCALinkTool" -@@ -296,7 +296,7 @@ - /> - <Tool - Name="VCCLCompilerTool" -- AdditionalIncludeDirectories="$(opensslDir)\inc32" -+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external" - /> - <Tool - Name="VCManagedResourceCompilerTool" -@@ -310,7 +310,7 @@ - /> - <Tool - Name="VCLinkerTool" -- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib" -+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib" - /> - <Tool - Name="VCALinkTool" -@@ -360,7 +360,7 @@ - /> - <Tool - Name="VCCLCompilerTool" -- AdditionalIncludeDirectories="$(opensslDir)\inc64" -+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external" - /> - <Tool - Name="VCManagedResourceCompilerTool" -@@ -374,7 +374,7 @@ - /> - <Tool - Name="VCLinkerTool" -- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib" -+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib" - TargetMachine="17" - /> - <Tool -@@ -424,7 +424,7 @@ - /> - <Tool - Name="VCCLCompilerTool" -- AdditionalIncludeDirectories="$(opensslDir)\inc32" -+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external" - /> - <Tool - Name="VCManagedResourceCompilerTool" -@@ -438,7 +438,7 @@ - /> - <Tool - Name="VCLinkerTool" -- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib" -+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib" - /> - <Tool - Name="VCALinkTool" -@@ -488,7 +488,7 @@ - /> - <Tool - Name="VCCLCompilerTool" -- AdditionalIncludeDirectories="$(opensslDir)\inc64" -+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external" - /> - <Tool - Name="VCManagedResourceCompilerTool" -@@ -502,7 +502,7 @@ - /> - <Tool - Name="VCLinkerTool" -- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib" -+ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\libeay32.lib $(SOLARVER)\$(INPATH)\lib$(UPDMINOREXT)\ssleay32.lib" - TargetMachine="17" - /> - <Tool ---- misc/Python-2.6.1/PC/VS8.0/build_ssl.py 2008-01-02 18:43:40.000000000 +0100 -+++ misc/build/Python-2.6.1/PC/VS8.0/build_ssl.py 2010-02-16 01:40:40.560375000 +0100 -@@ -247,4 +247,4 @@ - sys.exit(rc) - - if __name__=='__main__': -- main() -+ sys.exit(0) |