diff options
Diffstat (limited to 'python3/python-3.3.0-ssl.patch.1')
| -rw-r--r-- | python3/python-3.3.0-ssl.patch.1 | 40 |
1 files changed, 19 insertions, 21 deletions
diff --git a/python3/python-3.3.0-ssl.patch.1 b/python3/python-3.3.0-ssl.patch.1 index 852da8d572d3..a7c4c409f146 100644 --- a/python3/python-3.3.0-ssl.patch.1 +++ b/python3/python-3.3.0-ssl.patch.1 @@ -47,7 +47,7 @@ diff -ru python3.old_/PC/VS9.0/_ssl.vcproj python3/PC/VS9.0/_ssl.vcproj <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(opensslDir)\inc32" -+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc\external" ++ AdditionalIncludeDirectories="$(WORKDIR)/UnpackedTarball/openssl/include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -65,7 +65,7 @@ diff -ru python3.old_/PC/VS9.0/_ssl.vcproj python3/PC/VS9.0/_ssl.vcproj <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(opensslDir)\inc64" -+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc\external" ++ AdditionalIncludeDirectories="$(WORKDIR)/UnpackedTarball/openssl/include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -83,7 +83,7 @@ diff -ru python3.old_/PC/VS9.0/_ssl.vcproj python3/PC/VS9.0/_ssl.vcproj <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(opensslDir)\inc32" -+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc\external" ++ AdditionalIncludeDirectories="$(WORKDIR)/UnpackedTarball/openssl/include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -101,7 +101,7 @@ diff -ru python3.old_/PC/VS9.0/_ssl.vcproj python3/PC/VS9.0/_ssl.vcproj <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(opensslDir)\inc64" -+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc\external" ++ AdditionalIncludeDirectories="$(WORKDIR)/UnpackedTarball/openssl/include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -119,7 +119,7 @@ diff -ru python3.old_/PC/VS9.0/_ssl.vcproj python3/PC/VS9.0/_ssl.vcproj <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(opensslDir)\inc32" -+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc\external" ++ AdditionalIncludeDirectories="$(WORKDIR)/UnpackedTarball/openssl/include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -137,7 +137,7 @@ diff -ru python3.old_/PC/VS9.0/_ssl.vcproj python3/PC/VS9.0/_ssl.vcproj <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(opensslDir)\inc64" -+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc\external" ++ AdditionalIncludeDirectories="$(WORKDIR)/UnpackedTarball/openssl/include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -155,7 +155,7 @@ diff -ru python3.old_/PC/VS9.0/_ssl.vcproj python3/PC/VS9.0/_ssl.vcproj <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(opensslDir)\inc32" -+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc\external" ++ AdditionalIncludeDirectories="$(WORKDIR)/UnpackedTarball/openssl/include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -173,7 +173,7 @@ diff -ru python3.old_/PC/VS9.0/_ssl.vcproj python3/PC/VS9.0/_ssl.vcproj <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(opensslDir)\inc64" -+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc\external" ++ AdditionalIncludeDirectories="$(WORKDIR)/UnpackedTarball/openssl/include" /> <Tool Name="VCManagedResourceCompilerTool" @@ -206,7 +206,7 @@ diff -ru python3.old_/PCbuild/_ssl.vcxproj python3/PCbuild/_ssl.vcxproj <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> - <AdditionalIncludeDirectories>$(opensslDir)\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> -+ <AdditionalIncludeDirectories>$(SOLARVERSION)\$(INPATH)\inc\external;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> ++ <AdditionalIncludeDirectories>$(WORKDIR)/UnpackedTarball/openssl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <PreLinkEvent> <Command> @@ -223,7 +223,7 @@ diff -ru python3.old_/PCbuild/_ssl.vcxproj python3/PCbuild/_ssl.vcxproj </Midl> <ClCompile> - <AdditionalIncludeDirectories>$(opensslDir)\inc64;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> -+ <AdditionalIncludeDirectories>$(SOLARVERSION)\$(INPATH)\inc\external;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> ++ <AdditionalIncludeDirectories>$(WORKDIR)/UnpackedTarball/openssl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <PreLinkEvent> <Command> @@ -237,7 +237,7 @@ diff -ru python3.old_/PCbuild/_ssl.vcxproj python3/PCbuild/_ssl.vcxproj <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> - <AdditionalIncludeDirectories>$(opensslDir)\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> -+ <AdditionalIncludeDirectories>$(SOLARVERSION)\$(INPATH)\inc\external;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> ++ <AdditionalIncludeDirectories>$(WORKDIR)/UnpackedTarball/openssl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <PreLinkEvent> <Command> @@ -254,7 +254,7 @@ diff -ru python3.old_/PCbuild/_ssl.vcxproj python3/PCbuild/_ssl.vcxproj </Midl> <ClCompile> - <AdditionalIncludeDirectories>$(opensslDir)\inc64;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> -+ <AdditionalIncludeDirectories>$(SOLARVERSION)\$(INPATH)\inc\external;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> ++ <AdditionalIncludeDirectories>$(WORKDIR)/UnpackedTarball/openssl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <PreLinkEvent> <Command> @@ -268,7 +268,7 @@ diff -ru python3.old_/PCbuild/_ssl.vcxproj python3/PCbuild/_ssl.vcxproj <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGInstrument|Win32'"> <ClCompile> - <AdditionalIncludeDirectories>$(opensslDir)\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> -+ <AdditionalIncludeDirectories>$(SOLARVERSION)\$(INPATH)\inc\external;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> ++ <AdditionalIncludeDirectories>$(WORKDIR)/UnpackedTarball/openssl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <PreLinkEvent> <Command> @@ -285,7 +285,7 @@ diff -ru python3.old_/PCbuild/_ssl.vcxproj python3/PCbuild/_ssl.vcxproj </Midl> <ClCompile> - <AdditionalIncludeDirectories>$(opensslDir)\inc64;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> -+ <AdditionalIncludeDirectories>$(SOLARVERSION)\$(INPATH)\inc\external;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> ++ <AdditionalIncludeDirectories>$(WORKDIR)/UnpackedTarball/openssl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <PreLinkEvent> <Command> @@ -300,7 +300,7 @@ diff -ru python3.old_/PCbuild/_ssl.vcxproj python3/PCbuild/_ssl.vcxproj <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='PGUpdate|Win32'"> <ClCompile> - <AdditionalIncludeDirectories>$(opensslDir)\inc32;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> -+ <AdditionalIncludeDirectories>$(SOLARVERSION)\$(INPATH)\inc\external;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> ++ <AdditionalIncludeDirectories>$(WORKDIR)/UnpackedTarball/openssl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <PreLinkEvent> <Command> @@ -317,7 +317,7 @@ diff -ru python3.old_/PCbuild/_ssl.vcxproj python3/PCbuild/_ssl.vcxproj </Midl> <ClCompile> - <AdditionalIncludeDirectories>$(opensslDir)\inc64;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> -+ <AdditionalIncludeDirectories>$(SOLARVERSION)\$(INPATH)\inc\external;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> ++ <AdditionalIncludeDirectories>$(WORKDIR)/UnpackedTarball/openssl/include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> </ClCompile> <PreLinkEvent> <Command> @@ -343,14 +343,12 @@ diff -ru python3.old_/PCbuild/_ssl.vcxproj python3/PCbuild/_ssl.vcxproj 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 -@@ -757,7 +757,12 @@ +@@ -757,7 +757,10 @@ exts.append( Extension('_socket', ['socketmodule.c'], depends = ['socketmodule.h']) ) # Detect SSL support for the socket module (via _ssl) -+ ooosslinc = os.environ.get('SOLARVERSION') + '/' + \ -+ os.environ.get('INPATH') + '/' + \ -+ 'inc' -+ ooosslinc = ooosslinc + '/external/' ++ ooosslinc = os.environ.get('WORKDIR') + '/' + \ ++ '/UnpackedTarball/openssl/include/' search_for_ssl_incs_in = [ + ooosslinc, '/usr/local/ssl/include', |