Python-01-solaris-lib-dirs.diff revision 17197
17115N/A--- Python-2.4.6/setup.py.orig 2006-10-09 06:41:25.000000000 +1300
17115N/A+++ Python-2.4.6/setup.py 2009-08-20 22:46:18.561556263 +1200
6936N/A return sys.platform
6936N/A- # Ensure that /usr/local is always used
6936N/A+ if sys.platform != 'sunos5':
6936N/A+ # Ensure that /usr/local is always used
6936N/A if sys.platform == "darwin":
6936N/A lib_dirs = self.compiler.library_dirs + [
6936N/A '/lib64', '/usr/lib64',
6936N/A+ if self.compiler.find_library_file(lib_dirs,
6936N/A+ socket_libs.append('socket')
6939N/A+ if self.compiler.find_library_file(lib_dirs,
6939N/A+ socket_libs.append('nsl')
6944N/A+ if self.compiler.find_library_file(lib_dirs,
6944N/A+ socket_libs.append('resolv')
6957N/A- depends = ['socketmodule.h']) )
6957N/A+ depends = ['socketmodule.h'],
8438N/A ssl_incs = find_file('openssl/ssl.h', inc_dirs,
8438N/A+ ['/usr/sfw/include',
8904N/A+ if sys.maxint == 2147483647L:
8904N/A+ sfw_libdir = '/usr/sfw/lib';
8904N/A+ sfw_libdir = '/usr/sfw/lib/64';
8146N/A ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
8146N/A depends = ['socketmodule.h']), )
17115N/A if (self.compiler.find_library_file(lib_dirs, 'ncursesw')):
17115N/A- elif (self.compiler.find_library_file(lib_dirs, 'ncurses')):
17115N/A+ elif (self.compiler.find_library_file(lib_dirs + curses_lib_dirs, 'ncurses')):
17115N/A elif (self.compiler.find_library_file(lib_dirs, 'curses')
17115N/A- self.compiler.find_library_file(lib_dirs, panel_library)):
17115N/A+ self.compiler.find_library_file(lib_dirs + curses_lib_dirs, panel_library)):
6936N/A+ tcl_tk_lib_dirs = ['/usr/sfw/lib']
6936N/A+ tcl_tk_inc_dirs = ['/usr/sfw/include']
6936N/A- tklib = self.compiler.find_library_file(lib_dirs, 'tk' + version)
6936N/A- tcllib = self.compiler.find_library_file(lib_dirs, 'tcl' + version)
6936N/A+ tklib = self.compiler.find_library_file(lib_dirs, 'tk' + version, tcl_tk_lib_dirs)
6936N/A+ tcllib = self.compiler.find_library_file(lib_dirs, 'tcl' + version, tcl_tk_lib_dirs)
6936N/A+ tklib = self.compiler.find_library_file(tcl_tk_lib_dirs, 'tk' + version)
6936N/A+ tcllib = self.compiler.find_library_file(tcl_tk_lib_dirs, 'tcl' + version)