Python-01-solaris-lib-dirs.diff revision 17115
12741N/A--- Python-2.4.6/setup.py.orig 2006-10-09 06:41:25.000000000 +1300
12741N/A+++ Python-2.4.6/setup.py 2009-08-20 22:46:18.561556263 +1200
12741N/A return sys.platform
12741N/A- # Ensure that /usr/local is always used
12741N/A+ if sys.platform != 'sunos5':
12741N/A+ # Ensure that /usr/local is always used
12741N/A if sys.platform == "darwin":
12741N/A lib_dirs = self.compiler.library_dirs + [
12741N/A '/lib64', '/usr/lib64',
12741N/A+ if self.compiler.find_library_file(lib_dirs,
12818N/A+ socket_libs.append('socket')
12818N/A+ if self.compiler.find_library_file(lib_dirs,
12818N/A+ socket_libs.append('nsl')
12741N/A+ if self.compiler.find_library_file(lib_dirs,
12741N/A+ socket_libs.append('resolv')
12741N/A- depends = ['socketmodule.h']) )
12741N/A+ depends = ['socketmodule.h'],
12741N/A ssl_incs = find_file('openssl/ssl.h', inc_dirs,
12741N/A+ ['/usr/sfw/include',
12741N/A+ if sys.maxint == 2147483647L:
12741N/A+ sfw_libdir = '/usr/sfw/lib';
12741N/A+ sfw_libdir = '/usr/sfw/lib/64';
12741N/A ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
12741N/A depends = ['socketmodule.h']), )
12741N/A if (self.compiler.find_library_file(lib_dirs, 'ncursesw')):
12741N/A- elif (self.compiler.find_library_file(lib_dirs, 'ncurses')):
+ elif (self.compiler.find_library_file(lib_dirs + curses_lib_dirs, 'ncurses')):
elif (self.compiler.find_library_file(lib_dirs, 'curses')
- self.compiler.find_library_file(lib_dirs, panel_library)):
+ self.compiler.find_library_file(lib_dirs + curses_lib_dirs, panel_library)):
+ tcl_tk_lib_dirs = ['/usr/sfw/lib']
+ tcl_tk_inc_dirs = ['/usr/sfw/include']
- tklib = self.compiler.find_library_file(lib_dirs, 'tk' + version)
- tcllib = self.compiler.find_library_file(lib_dirs, 'tcl' + version)
+ tklib = self.compiler.find_library_file(lib_dirs, 'tk' + version, tcl_tk_lib_dirs)
+ tcllib = self.compiler.find_library_file(lib_dirs, 'tcl' + version, tcl_tk_lib_dirs)
+ # Exit the loop when we've found the Tcl/Tk libraries
+ tklib = self.compiler.find_library_file(tcl_tk_lib_dirs, 'tk' + version)
+ tcllib = self.compiler.find_library_file(tcl_tk_lib_dirs, 'tcl' + version)
# Exit the loop when we've found the Tcl/Tk libraries
tcl_include_sub += [dir + os.sep + "tcl" + dotversion]
tk_include_sub += [dir + os.sep + "tk" + dotversion]
tcl_includes = find_file('tcl.h', inc_dirs, tcl_include_sub)
tk_includes = find_file('tk.h', inc_dirs, tk_include_sub)
# OK... everything seems to be present for Tcl/Tk.
include_dirs.append(dir)