Skip to content

C
core
Kaydet (Commit) b01cf0f5 authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

UPDMINOREXT is gone away, drop it

üst f3565047
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 23 deletions
python/Python-ssl.patch
Dosyayı görüntüle @ b01cf0f5
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(opensslDir)\inc32" - AdditionalIncludeDirectories="$(opensslDir)\inc32"
+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external" + AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc\external"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib" - 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 <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(opensslDir)\inc64" - AdditionalIncludeDirectories="$(opensslDir)\inc64"
+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external" + AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc\external"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib" - 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 <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(opensslDir)\inc32" - AdditionalIncludeDirectories="$(opensslDir)\inc32"
+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external" + AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc\external"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib" - 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 <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(opensslDir)\inc64" - AdditionalIncludeDirectories="$(opensslDir)\inc64"
+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external" + AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc\external"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib" - 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 <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(opensslDir)\inc32" - AdditionalIncludeDirectories="$(opensslDir)\inc32"
+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external" + AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc\external"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib" - 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 <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(opensslDir)\inc64" - AdditionalIncludeDirectories="$(opensslDir)\inc64"
+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external" + AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc\external"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib" - 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" TargetMachine="17"
/> />
<Tool <Tool
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(opensslDir)\inc32" - AdditionalIncludeDirectories="$(opensslDir)\inc32"
+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external" + AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc\external"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib $(opensslDir)\out32\libeay32.lib $(opensslDir)\out32\ssleay32.lib" - 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 <Tool
Name="VCALinkTool" Name="VCALinkTool"
...@@ -139,7 +139,7 @@ ...@@ -139,7 +139,7 @@
<Tool <Tool
Name="VCCLCompilerTool" Name="VCCLCompilerTool"
- AdditionalIncludeDirectories="$(opensslDir)\inc64" - AdditionalIncludeDirectories="$(opensslDir)\inc64"
+ AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc$(UPDMINOREXT)\external" + AdditionalIncludeDirectories="$(SOLARVERSION)\$(INPATH)\inc\external"
/> />
<Tool <Tool
Name="VCManagedResourceCompilerTool" Name="VCManagedResourceCompilerTool"
...@@ -148,37 +148,32 @@ ...@@ -148,37 +148,32 @@
<Tool <Tool
Name="VCLinkerTool" Name="VCLinkerTool"
- AdditionalDependencies="ws2_32.lib $(opensslDir)\out64\libeay32.lib $(opensslDir)\out64\ssleay32.lib" - 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" TargetMachine="17"
/> />
<Tool <Tool
--- misc/Python-2.6.1/setup.py 2009-11-02 10:12:43.000000000 +0000 --- 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 +++ 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'], exts.append( Extension('_socket', ['socketmodule.c'],
depends = ['socketmodule.h']) ) depends = ['socketmodule.h']) )
# Detect SSL support for the socket module (via _ssl) # Detect SSL support for the socket module (via _ssl)
+ UPDMINOR = os.environ.get('UPDMINOREXT')
+ ooosslinc = os.environ.get('SOLARVERSION') + '/' + \ + ooosslinc = os.environ.get('SOLARVERSION') + '/' + \
+ os.environ.get('INPATH') + '/' + \ + os.environ.get('INPATH') + '/' + \
+ 'inc' + 'inc'
+ if UPDMINOR != None:
+ ooosslinc = ooosslinc + UPDMINOR
+ ooosslinc = ooosslinc + '/external/' + ooosslinc = ooosslinc + '/external/'
search_for_ssl_incs_in = [ search_for_ssl_incs_in = [
+ ooosslinc, + ooosslinc,
'/usr/local/ssl/include', '/usr/local/ssl/include',
'/usr/contrib/ssl/include/' '/usr/contrib/ssl/include/'
] ]
@@ -624,8 +632,15 @@ @@ -624,8 +632,13 @@
['/usr/kerberos/include']) ['/usr/kerberos/include'])
if krb5_h: if krb5_h:
ssl_incs += krb5_h ssl_incs += krb5_h
+ ooossllib = os.environ.get('SOLARVER') + '/' + \ + ooossllib = os.environ.get('SOLARVER') + '/' + \
+ os.environ.get('INPATH') + '/' + \ + os.environ.get('INPATH') + '/' + \
+ 'lib' + 'lib'
+ if UPDMINOR != None:
+ ooosslinc = ooosslinc + UPDMINOR
+ ooosslinc = ooosslinc + '/' + ooosslinc = ooosslinc + '/'
ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
- ['/usr/local/ssl/lib', - ['/usr/local/ssl/lib',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment