diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-07-29 14:48:32 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-07-29 14:48:32 +0100 |
| commit | b01cf0f5fc2ceba0d0920f945f0de7fc75405362 (patch) | |
| tree | 6c55ea33ed1c01d41b7221138cb87713879312eb /python | |
| parent | f3565047972af206d6ae85977716b3ddf8abe28f (diff) | |
UPDMINOREXT is gone away, drop it
Diffstat (limited to 'python')
| -rw-r--r-- | python/Python-ssl.patch | 41 |
1 files changed, 18 insertions, 23 deletions
diff --git a/python/Python-ssl.patch b/python/Python-ssl.patch index 642586f31584..e60fafab8f3e 100644 --- a/python/Python-ssl.patch +++ b/python/Python-ssl.patch @@ -13,7 +13,7 @@ <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(opensslDir)\inc32" -+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external" ++ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc\external" /> <Tool Name="VCManagedResourceCompilerTool" @@ -22,7 +22,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" ++ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib\libeay32.lib $(SOLARVER)\$(INPATH)\lib\ssleay32.lib" /> <Tool Name="VCALinkTool" @@ -31,7 +31,7 @@ <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(opensslDir)\inc64" -+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external" ++ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc\external" /> <Tool Name="VCManagedResourceCompilerTool" @@ -40,7 +40,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" ++ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib\libeay32.lib $(SOLARVER)\$(INPATH)\lib\ssleay32.lib" /> <Tool Name="VCALinkTool" @@ -49,7 +49,7 @@ <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(opensslDir)\inc32" -+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external" ++ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc\external" /> <Tool Name="VCManagedResourceCompilerTool" @@ -58,7 +58,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" ++ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib\libeay32.lib $(SOLARVER)\$(INPATH)\lib\ssleay32.lib" /> <Tool Name="VCALinkTool" @@ -67,7 +67,7 @@ <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(opensslDir)\inc64" -+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external" ++ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc\external" /> <Tool Name="VCManagedResourceCompilerTool" @@ -76,7 +76,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" ++ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib\libeay32.lib $(SOLARVER)\$(INPATH)\lib\ssleay32.lib" /> <Tool Name="VCALinkTool" @@ -85,7 +85,7 @@ <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(opensslDir)\inc32" -+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external" ++ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc\external" /> <Tool Name="VCManagedResourceCompilerTool" @@ -94,7 +94,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" ++ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib\libeay32.lib $(SOLARVER)\$(INPATH)\lib\ssleay32.lib" /> <Tool Name="VCALinkTool" @@ -103,7 +103,7 @@ <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(opensslDir)\inc64" -+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external" ++ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc\external" /> <Tool Name="VCManagedResourceCompilerTool" @@ -112,7 +112,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" ++ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib\libeay32.lib $(SOLARVER)\$(INPATH)\lib\ssleay32.lib" TargetMachine="17" /> <Tool @@ -121,7 +121,7 @@ <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(opensslDir)\inc32" -+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external" ++ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc\external" /> <Tool Name="VCManagedResourceCompilerTool" @@ -130,7 +130,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" ++ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib\libeay32.lib $(SOLARVER)\$(INPATH)\lib\ssleay32.lib" /> <Tool Name="VCALinkTool" @@ -139,7 +139,7 @@ <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories="$(opensslDir)\inc64" -+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external" ++ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc\external" /> <Tool Name="VCManagedResourceCompilerTool" @@ -148,37 +148,32 @@ <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" ++ AdditionalDependencies="ws2_32.lib $(SOLARVER)\$(INPATH)\lib\libeay32.lib $(SOLARVER)\$(INPATH)\lib\ssleay32.lib" TargetMachine="17" /> <Tool --- misc/Python-2.6.1/setup.py 2009-11-02 10:12:43.000000000 +0000 +++ misc/build/Python-2.6.1/setup.py 2009-11-02 10:18:19.000000000 +0000 -@@ -612,7 +612,15 @@ +@@ -612,7 +612,12 @@ exts.append( Extension('_socket', ['socketmodule.c'], depends = ['socketmodule.h']) ) # Detect SSL support for the socket module (via _ssl) -+ UPDMINOR = os.environ.get('UPDMINOREXT') + ooosslinc = os.environ.get('SOLARVERSION') + '/' + \ + os.environ.get('INPATH') + '/' + \ + 'inc' -+ if UPDMINOR != None: -+ ooosslinc = ooosslinc + UPDMINOR + ooosslinc = ooosslinc + '/external/' search_for_ssl_incs_in = [ + ooosslinc, '/usr/local/ssl/include', '/usr/contrib/ssl/include/' ] -@@ -624,8 +632,15 @@ +@@ -624,8 +632,13 @@ ['/usr/kerberos/include']) if krb5_h: ssl_incs += krb5_h + ooossllib = os.environ.get('SOLARVER') + '/' + \ + os.environ.get('INPATH') + '/' + \ + 'lib' -+ if UPDMINOR != None: -+ ooosslinc = ooosslinc + UPDMINOR + ooosslinc = ooosslinc + '/' ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, - ['/usr/local/ssl/lib', |