1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
|
--- misc/Python-2.7.5/setup.py 2013-07-01 17:51:46.237674580 +0200
+++ misc/build/Python-2.7.5/setup.py 2013-07-01 17:51:24.230453108 +0200
@@ -80,61 +80,62 @@
# system, but with only header files and libraries.
sysroot = macosx_sdk_root()
- # Check the standard locations
- for dir in std_dirs:
+ # Check the additional directories
+ for dir in paths:
f = os.path.join(dir, filename)
if host_platform == 'darwin' and is_macosx_sdk_path(dir):
f = os.path.join(sysroot, dir[1:], filename)
- if os.path.exists(f): return []
+ if os.path.exists(f):
+ return [dir]
- # Check the additional directories
- for dir in paths:
+ # Check the standard locations
+ for dir in std_dirs:
f = os.path.join(dir, filename)
if host_platform == 'darwin' and is_macosx_sdk_path(dir):
f = os.path.join(sysroot, dir[1:], filename)
if os.path.exists(f):
- return [dir]
+ return []
# Not found anywhere
return None
def find_library_file(compiler, libname, std_dirs, paths):
- result = compiler.find_library_file(std_dirs + paths, libname)
+ result = compiler.find_library_file(paths+std_dirs, libname)
if result is None:
return None
if host_platform == 'darwin':
sysroot = macosx_sdk_root()
- # Check whether the found file is in one of the standard directories
dirname = os.path.dirname(result)
- for p in std_dirs:
+ # Otherwise, it must have been in one of the additional directories,
+ # so we have to figure out which one.
+ for p in paths:
# Ensure path doesn't end with path separator
p = p.rstrip(os.sep)
if host_platform == 'darwin' and is_macosx_sdk_path(p):
if os.path.join(sysroot, p[1:]) == dirname:
- return [ ]
+ return [ p ]
if p == dirname:
- return [ ]
+ return [p]
- # Otherwise, it must have been in one of the additional directories,
- # so we have to figure out which one.
- for p in paths:
+ # Check whether the found file is in one of the standard directories
+ for p in std_dirs:
# Ensure path doesn't end with path separator
p = p.rstrip(os.sep)
if host_platform == 'darwin' and is_macosx_sdk_path(p):
if os.path.join(sysroot, p[1:]) == dirname:
- return [ p ]
+ return [ ]
if p == dirname:
- return [p]
+ return [ ]
else:
assert False, "Internal error: Path not found in std_dirs or paths"
@@ -819,6 +820,7 @@
exts.append( Extension('_ssl', ['_ssl.c'],
include_dirs = ssl_incs,
library_dirs = ssl_libs,
+ extra_link_args = ['-Wl,--exclude-libs,ALL'],
libraries = ['ssl', 'crypto'],
depends = ['socketmodule.h']), )
else:
@@ -858,6 +860,7 @@
exts.append( Extension('_hashlib', ['_hashopenssl.c'],
include_dirs = ssl_incs,
library_dirs = ssl_libs,
+ extra_link_args = ['-Wl,--exclude-libs,ALL'],
libraries = ['ssl', 'crypto']) )
else:
print ("warning: openssl 0x%08x is too old for _hashlib" %
|
