python/python-2.5-lib64.patch

   1 --- Python-2.5b1/Lib/distutils/command/install.py.lib64 2006-03-27 16:55:21.000000000 -0500
   2 +++ Python-2.5b1/Lib/distutils/command/install.py       2006-06-22 12:20:35.000000000 -0400
   3 @@ -39,14 +39,14 @@
   4  INSTALL_SCHEMES = {
   5      'unix_prefix': {
   6          'purelib': '$base/lib/python$py_version_short/site-packages',
   7 -        'platlib': '$platbase/lib/python$py_version_short/site-packages',
   8 +        'platlib': '$platbase/lib64/python$py_version_short/site-packages',
   9          'headers': '$base/include/python$py_version_short/$dist_name',
  10          'scripts': '$base/bin',
  11          'data'   : '$base',
  12          },
  13      'unix_home': {
  14          'purelib': '$base/lib/python',
  15 -        'platlib': '$base/lib/python',
  16 +        'platlib': '$base/lib64/python',
  17          'headers': '$base/include/python/$dist_name',
  18          'scripts': '$base/bin',
  19          'data'   : '$base',
  20 --- Python-2.5b1/Lib/distutils/sysconfig.py.lib64       2006-05-23 08:01:11.000000000 -0400
  21 +++ Python-2.5b1/Lib/distutils/sysconfig.py     2006-06-22 12:20:35.000000000 -0400
  22 @@ -99,8 +99,12 @@
  23          prefix = plat_specific and EXEC_PREFIX or PREFIX
  24
  25      if os.name == "posix":
  26 +        if plat_specific or standard_lib:
  27 +            lib = "lib64"
  28 +        else:
  29 +            lib = "lib"
  30          libpython = os.path.join(prefix,
  31 -                                 "lib", "python" + get_python_version())
  32 +                                 lib, "python" + get_python_version())
  33          if standard_lib:
  34              return libpython
  35          else:
  36 --- Python-2.5b1/Lib/site.py.lib64      2006-06-12 04:23:02.000000000 -0400
  37 +++ Python-2.5b1/Lib/site.py    2006-06-22 12:20:35.000000000 -0400
  38 @@ -182,9 +182,14 @@
  39                  sitedirs = [os.path.join(prefix, "Lib", "site-packages")]
  40              elif os.sep == '/':
  41                  sitedirs = [os.path.join(prefix,
  42 -                                         "lib",
  43 +                                         "lib64",
  44                                           "python" + sys.version[:3],
  45                                           "site-packages"),
  46 +                            os.path.join(prefix,
  47 +                                         "lib",
  48 +                                         "python" + sys.version[:3],
  49 +                                         "site-packages"),
  50 +                            os.path.join(prefix, "lib64", "site-python"),
  51                              os.path.join(prefix, "lib", "site-python")]
  52              else:
  53                  sitedirs = [prefix, os.path.join(prefix, "lib", "site-packages")]
  54 --- Python-2.5b1/setup.py.lib64 2006-06-05 19:38:06.000000000 -0400
  55 +++ Python-2.5b1/setup.py       2006-06-22 12:22:14.000000000 -0400
  56 @@ -244,7 +244,7 @@
  57
  58      def detect_modules(self):
  59          # Ensure that /usr/local is always used
  60 -        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
  61 +        add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64')
  62          add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
  63
  64          # Add paths specified in the environment variables LDFLAGS and
  65 @@ -496,11 +496,11 @@
  66              elif self.compiler.find_library_file(lib_dirs, 'curses'):
  67                  readline_libs.append('curses')
  68              elif self.compiler.find_library_file(lib_dirs +
  69 -                                               ['/usr/lib/termcap'],
  70 +                                               ['/usr/lib64/termcap'],
  71                                                 'termcap'):
  72                  readline_libs.append('termcap')
  73              exts.append( Extension('readline', ['readline.c'],
  74 -                                   library_dirs=['/usr/lib/termcap'],
  75 +                                   library_dirs=['/usr/lib64/termcap'],
  76                                     extra_link_args=readline_extra_link_args,
  77                                     libraries=readline_libs) )
  78          if platform not in ['mac']:
  79 @@ -532,8 +532,8 @@
  80              if krb5_h:
  81                  ssl_incs += krb5_h
  82          ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
  83 -                                     ['/usr/local/ssl/lib',
  84 -                                      '/usr/contrib/ssl/lib/'
  85 +                                     ['/usr/local/ssl/lib64',
  86 +                                      '/usr/contrib/ssl/lib64/'
  87                                       ] )
  88
  89          if (ssl_incs is not None and
  90 --- Python-2.5b1/Makefile.pre.in.lib64  2006-06-11 15:45:57.000000000 -0400
  91 +++ Python-2.5b1/Makefile.pre.in        2006-06-22 12:20:34.000000000 -0400
  92 @@ -84,11 +84,11 @@
  93
  94  # Expanded directories
  95  BINDIR=                $(exec_prefix)/bin
  96 -LIBDIR=                $(exec_prefix)/lib
  97 +LIBDIR=                $(exec_prefix)/lib64
  98  MANDIR=                @mandir@
  99  INCLUDEDIR=    @includedir@
 100  CONFINCLUDEDIR=        $(exec_prefix)/include
 101 -SCRIPTDIR=     $(prefix)/lib
 102 +SCRIPTDIR=     $(prefix)/lib64
 103
 104  # Detailed destination directories
 105  BINLIBDEST=    $(LIBDIR)/python$(VERSION)
 106 --- Python-2.5b1/Modules/Setup.dist.lib64       2006-06-22 12:20:34.000000000 -0400
 107 +++ Python-2.5b1/Modules/Setup.dist     2006-06-22 12:20:35.000000000 -0400
 108 @@ -401,7 +401,7 @@
 109  # and the subdirectory of PORT where you built it.
 110  DBLIBVER=4.3
 111  DBINC=/usr/include/db4
 112 -DBLIB=/usr/lib
 113 +DBLIB=/usr/lib64
 114  _bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
 115
 116  # Historical Berkeley DB 1.85
 117 @@ -447,7 +447,7 @@
 118  # Andrew Kuchling's zlib module.
 119  # This require zlib 1.1.3 (or later).
 120  # See http://www.gzip.org/zlib/
 121 -zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib -lz
 122 +zlib zlibmodule.c -I$(prefix)/include -L$(exec_prefix)/lib64 -lz
 123
 124  # Interface to the Expat XML parser
 125  #
 126 --- Python-2.5b1/Modules/getpath.c.lib64        2006-04-12 22:06:09.000000000 -0400
 127 +++ Python-2.5b1/Modules/getpath.c      2006-06-22 12:20:35.000000000 -0400
 128 @@ -117,8 +117,8 @@
 129  #endif
 130
 131  #ifndef PYTHONPATH
 132 -#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
 133 -              EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
 134 +#define PYTHONPATH PREFIX "/lib64/python" VERSION ":" \
 135 +              EXEC_PREFIX "/lib64/python" VERSION "/lib-dynload"
 136  #endif
 137
 138  #ifndef LANDMARK
 139 @@ -129,7 +129,7 @@
 140  static char exec_prefix[MAXPATHLEN+1];
 141  static char progpath[MAXPATHLEN+1];
 142  static char *module_search_path = NULL;
 143 -static char lib_python[] = "lib/python" VERSION;
 144 +static char lib_python[] = "lib64/python" VERSION;
 145
 146  static void
 147  reduce(char *dir)
 148 @@ -524,7 +524,7 @@
 149      }
 150      else
 151          strncpy(zip_path, PREFIX, MAXPATHLEN);
 152 -    joinpath(zip_path, "lib/python00.zip");
 153 +    joinpath(zip_path, "lib64/python00.zip");
 154      bufsz = strlen(zip_path);  /* Replace "00" with version */
 155      zip_path[bufsz - 6] = VERSION[0];
 156      zip_path[bufsz - 5] = VERSION[2];
 157 @@ -534,7 +534,7 @@
 158              fprintf(stderr,
 159                  "Could not find platform dependent libraries <exec_prefix>\n");
 160          strncpy(exec_prefix, EXEC_PREFIX, MAXPATHLEN);
 161 -        joinpath(exec_prefix, "lib/lib-dynload");
 162 +        joinpath(exec_prefix, "lib64/lib-dynload");
 163      }
 164      /* If we found EXEC_PREFIX do *not* reduce it!  (Yet.) */
 165