python3/python-3.6.0-lib64.patch

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