author | Mike Sullivan <Mike.Sullivan@Oracle.COM> |
Mon, 11 Mar 2013 10:38:09 -0700 | |
branch | s11-update |
changeset 2520 | ceec631e74d1 |
parent 885 | 2af25a1da825 |
child 1914 | 00e8dbcb9b1e |
child 3367 | ed5024e47b53 |
permissions | -rw-r--r-- |
458 | 1 |
--- Python-2.7.1/setup.py.~1~ Sun Oct 31 11:40:21 2010 |
2 |
+++ Python-2.7.1/setup.py Fri Jul 15 15:04:56 2011 |
|
885
2af25a1da825
7177355 python 2.7.1 should be updated to the latest 2.7.X release
Rich Burridge <rich.burridge@oracle.com>
parents:
458
diff
changeset
|
3 |
@@ -369,8 +369,8 @@ |
458 | 4 |
|
5 |
def detect_modules(self): |
|
6 |
# Ensure that /usr/local is always used |
|
7 |
- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') |
|
8 |
- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') |
|
9 |
+ #add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') |
|
10 |
+ #add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') |
|
885
2af25a1da825
7177355 python 2.7.1 should be updated to the latest 2.7.X release
Rich Burridge <rich.burridge@oracle.com>
parents:
458
diff
changeset
|
11 |
self.add_multiarch_paths() |
458 | 12 |
|
13 |
# Add paths specified in the environment variables LDFLAGS and |
|
14 |
@@ -657,6 +657,13 @@ |
|
15 |
['/usr/lib/termcap'], |
|
16 |
'termcap'): |
|
17 |
readline_libs.append('termcap') |
|
18 |
+ |
|
19 |
+ if platform == 'sunos5': |
|
20 |
+ # insert '-zrecord' before the readline libraries that we |
|
21 |
+ # want to link with to avoid rl_insert() elimination |
|
22 |
+ readline_extra_link_args = ('-Wl,-zrecord','-lreadline','-lncurses') |
|
23 |
+ readline_libs = () |
|
24 |
+ |
|
25 |
exts.append( Extension('readline', ['readline.c'], |
|
26 |
library_dirs=['/usr/lib/termcap'], |
|
27 |
extra_link_args=readline_extra_link_args, |
|
28 |
@@ -677,6 +684,7 @@ |
|
29 |
||
30 |
# socket(2) |
|
31 |
exts.append( Extension('_socket', ['socketmodule.c'], |
|
32 |
+ libraries = ['socket', 'nsl'], |
|
33 |
depends = ['socketmodule.h']) ) |
|
34 |
# Detect SSL support for the socket module (via _ssl) |
|
35 |
search_for_ssl_incs_in = [ |
|
36 |
@@ -1443,9 +1451,14 @@ |
|
37 |
sysconfig.get_config_var('POSIX_SEMAPHORES_NOT_ENABLED')): |
|
38 |
multiprocessing_srcs.append('_multiprocessing/semaphore.c') |
|
39 |
||
40 |
+ multiproc_libs = [] |
|
41 |
+ if platform == 'sunos5': |
|
42 |
+ multiproc_libs = [ "xnet" ] |
|
43 |
+ |
|
44 |
if sysconfig.get_config_var('WITH_THREAD'): |
|
45 |
exts.append ( Extension('_multiprocessing', multiprocessing_srcs, |
|
46 |
define_macros=macros.items(), |
|
47 |
+ libraries=multiproc_libs, |
|
48 |
include_dirs=["Modules/_multiprocessing"])) |
|
49 |
else: |
|
50 |
missing.append('_multiprocessing') |
|
51 |
@@ -1896,7 +1909,8 @@ |
|
52 |
# this option. If you want to compile ctypes with the Sun |
|
53 |
# compiler, please research a proper solution, instead of |
|
54 |
# finding some -z option for the Sun compiler. |
|
55 |
- extra_link_args.append('-mimpure-text') |
|
56 |
+ #extra_link_args.append('-mimpure-text') |
|
57 |
+ pass |
|
58 |
||
59 |
elif sys.platform.startswith('hp-ux'): |
|
60 |
extra_link_args.append('-fPIC') |