python3/python-3.4.3-lib64.patch

   1 --- Python-3.4.0b1/Lib/distutils/command/install.py.lib64     2013-11-24 21:36:54.000000000 +0100
   2 +++ Python-3.4.0b1/Lib/distutils/command/install.py     2013-11-27 11:10:43.821150774 +0100
   3 @@ -45,14 +45,14 @@ else:
   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$abiflags/$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-3.4.0b1/Lib/distutils/sysconfig.py.lib64     2013-11-24 21:36:54.000000000 +0100
  21 +++ Python-3.4.0b1/Lib/distutils/sysconfig.py   2013-11-27 11:10:43.821150774 +0100
  22 @@ -141,8 +141,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-3.4.0b1/Lib/site.py.lib64    2013-11-24 21:36:54.000000000 +0100
  37 +++ Python-3.4.0b1/Lib/site.py  2013-11-27 11:10:43.822150773 +0100
  38 @@ -304,12 +304,16 @@
  39          seen.add(prefix)
  40
  41          if os.sep == '/':
  42 +            sitepackages.append(os.path.join(prefix, "lib64",
  43 +                                        "python" + sys.version[:3],
  44 +                                        "site-packages"))
  45              sitepackages.append(os.path.join(prefix, "lib",
  46                                          "python" + sys.version[:3],
  47                                          "site-packages"))
  48              sitepackages.append(os.path.join(prefix, "lib", "site-python"))
  49          else:
  50              sitepackages.append(prefix)
  51 +            sitepackages.append(os.path.join(prefix, "lib64", "site-packages"))
  52              sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
  53          if sys.platform == "darwin":
  54              # for framework builds *only* we add the standard Apple
  55 --- Python-3.4.0b1/Lib/sysconfig.py.lib64       2013-11-24 21:36:54.000000000 +0100
  56 +++ Python-3.4.0b1/Lib/sysconfig.py     2013-11-27 11:10:43.822150773 +0100
  57 @@ -20,10 +20,10 @@
  58
  59  _INSTALL_SCHEMES = {
  60      'posix_prefix': {
  61 -        'stdlib': '{installed_base}/lib/python{py_version_short}',
  62 -        'platstdlib': '{platbase}/lib/python{py_version_short}',
  63 +        'stdlib': '{installed_base}/lib64/python{py_version_short}',
  64 +        'platstdlib': '{platbase}/lib64/python{py_version_short}',
  65          'purelib': '{base}/lib/python{py_version_short}/site-packages',
  66 -        'platlib': '{platbase}/lib/python{py_version_short}/site-packages',
  67 +        'platlib': '{platbase}/lib64/python{py_version_short}/site-packages',
  68          'include':
  69              '{installed_base}/include/python{py_version_short}{abiflags}',
  70          'platinclude':
  71 @@ -61,10 +61,10 @@
  72          'data': '{userbase}',
  73          },
  74      'posix_user': {
  75 -        'stdlib': '{userbase}/lib/python{py_version_short}',
  76 -        'platstdlib': '{userbase}/lib/python{py_version_short}',
  77 +        'stdlib': '{userbase}/lib64/python{py_version_short}',
  78 +        'platstdlib': '{userbase}/lib64/python{py_version_short}',
  79          'purelib': '{userbase}/lib/python{py_version_short}/site-packages',
  80 -        'platlib': '{userbase}/lib/python{py_version_short}/site-packages',
  81 +        'platlib': '{userbase}/lib64/python{py_version_short}/site-packages',
  82          'include': '{userbase}/include/python{py_version_short}',
  83          'scripts': '{userbase}/bin',
  84          'data': '{userbase}',
  85 --- Python-3.4.0b1/Lib/test/test_site.py.lib64  2013-11-24 21:36:55.000000000 +0100
  86 +++ Python-3.4.0b1/Lib/test/test_site.py        2013-11-27 11:10:43.822150773 +0100
  87 @@ -244,12 +244,15 @@
  88              self.assertEqual(dirs[2], wanted)
  89          elif os.sep == '/':
  90              # OS X non-framwework builds, Linux, FreeBSD, etc
  91 -            self.assertEqual(len(dirs), 2)
  92 -            wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3],
  93 +            self.assertEqual(len(dirs), 3)
  94 +            wanted = os.path.join('xoxo', 'lib64', 'python' + sys.version[:3],
  95                                    'site-packages')
  96              self.assertEqual(dirs[0], wanted)
  97 -            wanted = os.path.join('xoxo', 'lib', 'site-python')
  98 +            wanted = os.path.join('xoxo', 'lib', 'python' + sys.version[:3],
  99 +                                  'site-packages')
 100              self.assertEqual(dirs[1], wanted)
 101 +            wanted = os.path.join('xoxo', 'lib', 'site-python')
 102 +            self.assertEqual(dirs[2], wanted)
 103          else:
 104              # other platforms
 105              self.assertEqual(len(dirs), 2)
 106 --- Python-3.4.0b1/Makefile.pre.in.lib64        2013-11-27 11:10:43.814150786 +0100
 107 +++ Python-3.4.0b1/Makefile.pre.in      2013-11-27 11:10:43.823150771 +0100
 108 @@ -115,7 +115,7 @@
 109  MANDIR=                @mandir@
 110  INCLUDEDIR=    @includedir@
 111  CONFINCLUDEDIR=        $(exec_prefix)/include
 112 -SCRIPTDIR=     $(prefix)/lib
 113 +SCRIPTDIR=     $(prefix)/lib64
 114  ABIFLAGS=      @ABIFLAGS@
 115
 116  # Detailed destination directories
 117 --- Python-3.4.0b1/Modules/getpath.c.lib64      2013-11-24 21:36:56.000000000 +0100
 118 +++ Python-3.4.0b1/Modules/getpath.c    2013-11-27 11:17:33.619449704 +0100
 119 @@ -122,8 +122,8 @@
 120  #endif
 121
 122  #ifndef PYTHONPATH
 123 -#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
 124 -              EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
 125 +#define PYTHONPATH PREFIX "/lib64/python" VERSION ":" \
 126 +              EXEC_PREFIX "/lib64/python" VERSION "/lib-dynload"
 127  #endif
 128
 129  #ifndef LANDMARK
 130 @@ -498,7 +498,7 @@
 131      _pythonpath = _Py_char2wchar(PYTHONPATH, NULL);
 132      _prefix = _Py_char2wchar(PREFIX, NULL);
 133      _exec_prefix = _Py_char2wchar(EXEC_PREFIX, NULL);
 134 -    lib_python = _Py_char2wchar("lib/python" VERSION, NULL);
 135 +    lib_python = _Py_char2wchar("lib64/python" VERSION, NULL);
 136
 137      if (!_pythonpath || !_prefix || !_exec_prefix || !lib_python) {
 138          Py_FatalError(
 139 @@ -687,7 +687,7 @@
 140      }
 141      else
 142          wcsncpy(zip_path, _prefix, MAXPATHLEN);
 143 -    joinpath(zip_path, L"lib/python00.zip");
 144 +    joinpath(zip_path, L"lib64/python00.zip");
 145      bufsz = wcslen(zip_path);   /* Replace "00" with version */
 146      zip_path[bufsz - 6] = VERSION[0];
 147      zip_path[bufsz - 5] = VERSION[2];
 148 @@ -699,7 +699,7 @@
 149              fprintf(stderr,
 150                  "Could not find platform dependent libraries <exec_prefix>\n");
 151          wcsncpy(exec_prefix, _exec_prefix, MAXPATHLEN);
 152 -        joinpath(exec_prefix, L"lib/lib-dynload");
 153 +        joinpath(exec_prefix, L"lib64/lib-dynload");
 154      }
 155      /* If we found EXEC_PREFIX do *not* reduce it!  (Yet.) */
 156
 157 --- Python-3.4.0b1/setup.py.lib64       2013-11-24 21:36:56.000000000 +0100
 158 +++ Python-3.4.0b1/setup.py     2013-11-27 11:10:43.824150769 +0100
 159 @@ -441,7 +441,7 @@
 160          # directories (i.e. '.' and 'Include') must be first.  See issue
 161          # 10520.
 162          if not cross_compiling:
 163 -            add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
 164 +            add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64')
 165              add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
 166          # only change this for cross builds for 3.3, issues on Mageia
 167          if cross_compiling:
 168 @@ -718,11 +718,11 @@
 169              elif curses_library:
 170                  readline_libs.append(curses_library)
 171              elif self.compiler.find_library_file(lib_dirs +
 172 -                                                     ['/usr/lib/termcap'],
 173 +                                                     ['/usr/lib64/termcap'],
 174                                                       'termcap'):
 175                  readline_libs.append('termcap')
 176              exts.append( Extension('readline', ['readline.c'],
 177 -                                   library_dirs=['/usr/lib/termcap'],
 178 +                                   library_dirs=['/usr/lib64/termcap'],
 179                                     extra_link_args=readline_extra_link_args,
 180                                     libraries=readline_libs) )
 181          else:
 182 @@ -759,8 +759,8 @@
 183              if krb5_h:
 184                  ssl_incs += krb5_h
 185          ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
 186 -                                     ['/usr/local/ssl/lib',
 187 -                                      '/usr/contrib/ssl/lib/'
 188 +                                     ['/usr/local/ssl/lib64',
 189 +                                      '/usr/contrib/ssl/lib64/'
 190                                       ] )
 191
 192          if (ssl_incs is not None and