python3/python-3.3.0b1-lib64.patch

   1 diff -up cpython-59223da36dec/Lib/distutils/command/install.py.lib64 cpython-59223da36dec/Lib/distutils/command/install.py
   2 --- cpython-59223da36dec/Lib/distutils/command/install.py.lib64 2012-08-07 06:10:57.000000000 -0400
   3 +++ cpython-59223da36dec/Lib/distutils/command/install.py       2012-08-07 16:41:00.573477549 -0400
   4 @@ -45,14 +45,14 @@ else:
   5  INSTALL_SCHEMES = {
   6      'unix_prefix': {
   7          'purelib': '$base/lib/python$py_version_short/site-packages',
   8 -        'platlib': '$platbase/lib/python$py_version_short/site-packages',
   9 +        'platlib': '$platbase/lib64/python$py_version_short/site-packages',
  10          'headers': '$base/include/python$py_version_short$abiflags/$dist_name',
  11          'scripts': '$base/bin',
  12          'data'   : '$base',
  13          },
  14      'unix_home': {
  15          'purelib': '$base/lib/python',
  16 -        'platlib': '$base/lib/python',
  17 +        'platlib': '$base/lib64/python',
  18          'headers': '$base/include/python/$dist_name',
  19          'scripts': '$base/bin',
  20          'data'   : '$base',
  21 diff -up cpython-59223da36dec/Lib/distutils/sysconfig.py.lib64 cpython-59223da36dec/Lib/distutils/sysconfig.py
  22 --- cpython-59223da36dec/Lib/distutils/sysconfig.py.lib64       2012-08-07 06:10:57.000000000 -0400
  23 +++ cpython-59223da36dec/Lib/distutils/sysconfig.py     2012-08-07 16:41:00.573477549 -0400
  24 @@ -139,8 +139,12 @@ def get_python_lib(plat_specific=0, stan
  25              prefix = plat_specific and EXEC_PREFIX or PREFIX
  26
  27      if os.name == "posix":
  28 +        if plat_specific or standard_lib:
  29 +            lib = "lib64"
  30 +        else:
  31 +            lib = "lib"
  32          libpython = os.path.join(prefix,
  33 -                                 "lib", "python" + get_python_version())
  34 +                                 lib, "python" + get_python_version())
  35          if standard_lib:
  36              return libpython
  37          else:
  38 diff -up cpython-59223da36dec/Lib/site.py.lib64 cpython-59223da36dec/Lib/site.py
  39 --- cpython-59223da36dec/Lib/site.py.lib64      2012-08-07 06:10:57.000000000 -0400
  40 +++ cpython-59223da36dec/Lib/site.py    2012-08-07 16:41:00.573477549 -0400
  41 @@ -303,12 +303,16 @@ def getsitepackages(prefixes=None):
  42          if sys.platform in ('os2emx', 'riscos'):
  43              sitepackages.append(os.path.join(prefix, "Lib", "site-packages"))
  44          elif os.sep == '/':
  45 +            sitepackages.append(os.path.join(prefix, "lib64",
  46 +                                        "python" + sys.version[:3],
  47 +                                        "site-packages"))
  48              sitepackages.append(os.path.join(prefix, "lib",
  49                                          "python" + sys.version[:3],
  50                                          "site-packages"))
  51              sitepackages.append(os.path.join(prefix, "lib", "site-python"))
  52          else:
  53              sitepackages.append(prefix)
  54 +            sitepackages.append(os.path.join(prefix, "lib64", "site-packages"))
  55              sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
  56          if sys.platform == "darwin":
  57              # for framework builds *only* we add the standard Apple
  58 diff -up cpython-59223da36dec/Lib/sysconfig.py.lib64 cpython-59223da36dec/Lib/sysconfig.py
  59 --- cpython-59223da36dec/Lib/sysconfig.py.lib64 2012-08-07 06:10:57.000000000 -0400
  60 +++ cpython-59223da36dec/Lib/sysconfig.py       2012-08-07 16:41:00.574477549 -0400
  61 @@ -21,10 +21,10 @@ __all__ = [
  62
  63  _INSTALL_SCHEMES = {
  64      'posix_prefix': {
  65 -        'stdlib': '{installed_base}/lib/python{py_version_short}',
  66 -        'platstdlib': '{platbase}/lib/python{py_version_short}',
  67 +        'stdlib': '{installed_base}/lib64/python{py_version_short}',
  68 +        'platstdlib': '{platbase}/lib64/python{py_version_short}',
  69          'purelib': '{base}/lib/python{py_version_short}/site-packages',
  70 -        'platlib': '{platbase}/lib/python{py_version_short}/site-packages',
  71 +        'platlib': '{platbase}/lib64/python{py_version_short}/site-packages',
  72          'include':
  73              '{installed_base}/include/python{py_version_short}{abiflags}',
  74          'platinclude':
  75 @@ -81,10 +81,10 @@ _INSTALL_SCHEMES = {
  76          'data': '{userbase}',
  77          },
  78      'posix_user': {
  79 -        'stdlib': '{userbase}/lib/python{py_version_short}',
  80 -        'platstdlib': '{userbase}/lib/python{py_version_short}',
  81 +        'stdlib': '{userbase}/lib64/python{py_version_short}',
  82 +        'platstdlib': '{userbase}/lib64/python{py_version_short}',
  83          'purelib': '{userbase}/lib/python{py_version_short}/site-packages',
  84 -        'platlib': '{userbase}/lib/python{py_version_short}/site-packages',
  85 +        'platlib': '{userbase}/lib64/python{py_version_short}/site-packages',
  86          'include': '{userbase}/include/python{py_version_short}',
  87          'scripts': '{userbase}/bin',
  88          'data': '{userbase}',
  89 diff -up cpython-59223da36dec/Lib/test/test_site.py.lib64 cpython-59223da36dec/Lib/test/test_site.py
  90 --- cpython-59223da36dec/Lib/test/test_site.py.lib64    2012-08-07 06:10:57.000000000 -0400
  91 +++ cpython-59223da36dec/Lib/test/test_site.py  2012-08-07 16:41:00.574477549 -0400
  92 @@ -239,12 +239,15 @@ class HelperFunctionsTests(unittest.Test
  93              self.assertEqual(dirs[2], wanted)
  94          elif os.sep == '/':
  95              # OS X non-framwework builds, Linux, FreeBSD, etc
  96 -            self.assertEqual(len(dirs), 2)
  97 -            wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3],
  98 +            self.assertEqual(len(dirs), 3)
  99 +            wanted = os.path.join('xoxo', 'lib64', 'python' + sys.version[:3],
 100                                    'site-packages')
 101              self.assertEqual(dirs[0], wanted)
 102 -            wanted = os.path.join('xoxo', 'lib', 'site-python')
 103 +            wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3],
 104 +                                  'site-packages')
 105              self.assertEqual(dirs[1], wanted)
 106 +            wanted = os.path.join('xoxo', 'lib', 'site-python')
 107 +            self.assertEqual(dirs[2], wanted)
 108          else:
 109              # other platforms
 110              self.assertEqual(len(dirs), 2)
 111 diff -up cpython-59223da36dec/Makefile.pre.in.lib64 cpython-59223da36dec/Makefile.pre.in
 112 --- cpython-59223da36dec/Makefile.pre.in.lib64  2012-08-07 16:41:00.557477550 -0400
 113 +++ cpython-59223da36dec/Makefile.pre.in        2012-08-07 16:41:00.575477549 -0400
 114 @@ -108,7 +108,7 @@ LIBDIR=             @libdir@
 115  MANDIR=                @mandir@
 116  INCLUDEDIR=    @includedir@
 117  CONFINCLUDEDIR=        $(exec_prefix)/include
 118 -SCRIPTDIR=     $(prefix)/lib
 119 +SCRIPTDIR=     $(prefix)/lib64
 120  ABIFLAGS=      @ABIFLAGS@
 121
 122  # Detailed destination directories
 123 diff -up cpython-59223da36dec/Modules/getpath.c.lib64 cpython-59223da36dec/Modules/getpath.c
 124 --- cpython-59223da36dec/Modules/getpath.c.lib64        2012-08-07 06:10:57.000000000 -0400
 125 +++ cpython-59223da36dec/Modules/getpath.c      2012-08-07 16:41:00.575477549 -0400
 126 @@ -122,8 +122,8 @@
 127  #endif
 128
 129  #ifndef PYTHONPATH
 130 -#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
 131 -              EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
 132 +#define PYTHONPATH PREFIX "/lib64/python" VERSION ":" \
 133 +              EXEC_PREFIX "/lib64/python" VERSION "/lib-dynload"
 134  #endif
 135
 136  #ifndef LANDMARK
 137 @@ -135,7 +135,7 @@ static wchar_t exec_prefix[MAXPATHLEN+1]
 138  static wchar_t progpath[MAXPATHLEN+1];
 139  static wchar_t *module_search_path = NULL;
 140  static int module_search_path_malloced = 0;
 141 -static wchar_t *lib_python = L"lib/python" VERSION;
 142 +static wchar_t *lib_python = L"lib64/python" VERSION;
 143
 144  static void
 145  reduce(wchar_t *dir)
 146 @@ -677,7 +677,7 @@ calculate_path(void)
 147      }
 148      else
 149          wcsncpy(zip_path, _prefix, MAXPATHLEN);
 150 -    joinpath(zip_path, L"lib/python00.zip");
 151 +    joinpath(zip_path, L"lib64/python00.zip");
 152      bufsz = wcslen(zip_path);   /* Replace "00" with version */
 153      zip_path[bufsz - 6] = VERSION[0];
 154      zip_path[bufsz - 5] = VERSION[2];
 155 @@ -687,7 +687,7 @@ calculate_path(void)
 156              fprintf(stderr,
 157                  "Could not find platform dependent libraries <exec_prefix>\n");
 158          wcsncpy(exec_prefix, _exec_prefix, MAXPATHLEN);
 159 -        joinpath(exec_prefix, L"lib/lib-dynload");
 160 +        joinpath(exec_prefix, L"lib64/lib-dynload");
 161      }
 162      /* If we found EXEC_PREFIX do *not* reduce it!  (Yet.) */
 163
 164 diff -up cpython-59223da36dec/setup.py.lib64 cpython-59223da36dec/setup.py
 165 --- cpython-59223da36dec/setup.py.lib64 2012-08-07 06:10:57.000000000 -0400
 166 +++ cpython-59223da36dec/setup.py       2012-08-07 16:41:32.153475390 -0400
 167 @@ -438,7 +438,7 @@ class PyBuildExt(build_ext):
 168          # directories (i.e. '.' and 'Include') must be first.  See issue
 169          # 10520.
 170          if not cross_compiling:
 171 -            add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
 172 +            add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64')
 173              add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
 174          # only change this for cross builds for 3.3, issues on Mageia
 175          if cross_compiling:
 176 @@ -708,11 +708,11 @@ class PyBuildExt(build_ext):
 177              elif curses_library:
 178                  readline_libs.append(curses_library)
 179              elif self.compiler.find_library_file(lib_dirs +
 180 -                                                     ['/usr/lib/termcap'],
 181 +                                                     ['/usr/lib64/termcap'],
 182                                                       'termcap'):
 183                  readline_libs.append('termcap')
 184              exts.append( Extension('readline', ['readline.c'],
 185 -                                   library_dirs=['/usr/lib/termcap'],
 186 +                                   library_dirs=['/usr/lib64/termcap'],
 187                                     extra_link_args=readline_extra_link_args,
 188                                     libraries=readline_libs) )
 189          else:
 190 @@ -749,8 +749,8 @@ class PyBuildExt(build_ext):
 191              if krb5_h:
 192                  ssl_incs += krb5_h
 193          ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
 194 -                                     ['/usr/local/ssl/lib',
 195 -                                      '/usr/contrib/ssl/lib/'
 196 +                                     ['/usr/local/ssl/lib64',
 197 +                                      '/usr/contrib/ssl/lib64/'
 198                                       ] )
 199
 200          if (ssl_incs is not None and