diff --git a/Lib/distutils/command/install.py b/Lib/distutils/command/install.py index 8e41290..25d6963 100644 --- a/Lib/distutils/command/install.py +++ b/Lib/distutils/command/install.py @@ -29,15 +29,15 @@ WINDOWS_SCHEME = { INSTALL_SCHEMES = { 'unix_prefix': { - 'purelib': '$base/lib/python$py_version_short/site-packages', - 'platlib': '$platbase/lib/python$py_version_short/site-packages', - 'headers': '$base/include/python$py_version_short$abiflags/$dist_name', + 'purelib': '$base/lib/platform-python/site-packages', + 'platlib': '$platbase/lib64/platform-python/site-packages', + 'headers': '$base/include/platform-python$abiflags/$dist_name', 'scripts': '$base/bin', 'data' : '$base', }, 'unix_home': { 'purelib': '$base/lib/python', - 'platlib': '$base/lib/python', + 'platlib': '$base/lib64/python', 'headers': '$base/include/python/$dist_name', 'scripts': '$base/bin', 'data' : '$base', @@ -59,7 +59,7 @@ if HAS_USER_SITE: 'purelib': '$usersite', 'platlib': '$usersite', 'headers': - '$userbase/include/python$py_version_short$abiflags/$dist_name', + '$userbase/include/platform-python$abiflags/$dist_name', 'scripts': '$userbase/bin', 'data' : '$userbase', } diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py index 5c2670f..721be70 100644 --- a/Lib/distutils/sysconfig.py +++ b/Lib/distutils/sysconfig.py @@ -129,8 +129,12 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None): prefix = plat_specific and EXEC_PREFIX or PREFIX if os.name == "posix": + if plat_specific or standard_lib: + lib = "lib64" + else: + lib = "lib" libpython = os.path.join(prefix, - "lib", "python" + get_python_version()) + lib, "platform-python") if standard_lib: return libpython else: diff --git a/Lib/site.py b/Lib/site.py index 386d2ad..91a2b7f 100644 --- a/Lib/site.py +++ b/Lib/site.py @@ -304,11 +304,15 @@ def getsitepackages(prefixes=None): seen.add(prefix) if os.sep == '/': + sitepackages.append(os.path.join(prefix, "lib64", + "platform-python", + "site-packages")) sitepackages.append(os.path.join(prefix, "lib", - "python%d.%d" % sys.version_info[:2], + "platform-python", "site-packages")) else: sitepackages.append(prefix) + sitepackages.append(os.path.join(prefix, "lib64", "site-packages")) sitepackages.append(os.path.join(prefix, "lib", "site-packages")) if sys.platform == "darwin": # for framework builds *only* we add the standard Apple diff --git a/Lib/sysconfig.py b/Lib/sysconfig.py index d35b5eb..af9a664 100644 --- a/Lib/sysconfig.py +++ b/Lib/sysconfig.py @@ -20,14 +20,14 @@ __all__ = [ _INSTALL_SCHEMES = { 'posix_prefix': { - 'stdlib': '{installed_base}/lib/python{py_version_short}', - 'platstdlib': '{platbase}/lib/python{py_version_short}', - 'purelib': '{base}/lib/python{py_version_short}/site-packages', - 'platlib': '{platbase}/lib/python{py_version_short}/site-packages', + 'stdlib': '{installed_base}/lib64/platform-python', + 'platstdlib': '{platbase}/lib64/platform-python', + 'purelib': '{base}/lib/platform-python/site-packages', + 'platlib': '{platbase}/lib64/platform-python/site-packages', 'include': - '{installed_base}/include/python{py_version_short}{abiflags}', + '{installed_base}/include/platform-python{abiflags}', 'platinclude': - '{installed_platbase}/include/python{py_version_short}{abiflags}', + '{installed_platbase}/include/platform-python{abiflags}', 'scripts': '{base}/bin', 'data': '{base}', }, @@ -61,11 +61,11 @@ _INSTALL_SCHEMES = { 'data': '{userbase}', }, 'posix_user': { - 'stdlib': '{userbase}/lib/python{py_version_short}', - 'platstdlib': '{userbase}/lib/python{py_version_short}', - 'purelib': '{userbase}/lib/python{py_version_short}/site-packages', - 'platlib': '{userbase}/lib/python{py_version_short}/site-packages', - 'include': '{userbase}/include/python{py_version_short}', + 'stdlib': '{userbase}/lib64/platform-python', + 'platstdlib': '{userbase}/lib64/platform-python', + 'purelib': '{userbase}/lib/platform-python/site-packages', + 'platlib': '{userbase}/lib64/platform-python/site-packages', + 'include': '{userbase}/include/platform-python', 'scripts': '{userbase}/bin', 'data': '{userbase}', }, diff --git a/Lib/test/test_site.py b/Lib/test/test_site.py index 4029617..9c98c06 100644 --- a/Lib/test/test_site.py +++ b/Lib/test/test_site.py @@ -260,9 +260,9 @@ class HelperFunctionsTests(unittest.TestCase): self.assertEqual(dirs[1], wanted) elif os.sep == '/': # OS X non-framwework builds, Linux, FreeBSD, etc - self.assertEqual(len(dirs), 1) - wanted = os.path.join('xoxo', 'lib', - 'python%d.%d' % sys.version_info[:2], + self.assertEqual(len(dirs), 2) + wanted = os.path.join('xoxo', 'lib64', + 'platform-python', 'site-packages') self.assertEqual(dirs[0], wanted) else: diff --git a/Makefile.pre.in b/Makefile.pre.in index e61fd55..e7414de 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -133,14 +133,14 @@ LIBDIR= @libdir@ MANDIR= @mandir@ INCLUDEDIR= @includedir@ CONFINCLUDEDIR= $(exec_prefix)/include -SCRIPTDIR= $(prefix)/lib +SCRIPTDIR= $(prefix)/lib64 ABIFLAGS= @ABIFLAGS@ # Detailed destination directories -BINLIBDEST= $(LIBDIR)/python$(VERSION) -LIBDEST= $(SCRIPTDIR)/python$(VERSION) -INCLUDEPY= $(INCLUDEDIR)/python$(LDVERSION) -CONFINCLUDEPY= $(CONFINCLUDEDIR)/python$(LDVERSION) +BINLIBDEST= $(LIBDIR)/platform-python +LIBDEST= $(SCRIPTDIR)/platform-python +INCLUDEPY= $(INCLUDEDIR)/platform-python$(LDVERSION) +CONFINCLUDEPY= $(CONFINCLUDEDIR)/platform-python$(LDVERSION) # Symbols used for using shared libraries SHLIB_SUFFIX= @SHLIB_SUFFIX@ diff --git a/Modules/getpath.c b/Modules/getpath.c index 0f91643..c4055be 100644 --- a/Modules/getpath.c +++ b/Modules/getpath.c @@ -494,7 +494,7 @@ calculate_path(void) _pythonpath = Py_DecodeLocale(PYTHONPATH, NULL); _prefix = Py_DecodeLocale(PREFIX, NULL); _exec_prefix = Py_DecodeLocale(EXEC_PREFIX, NULL); - lib_python = Py_DecodeLocale("lib/python" VERSION, NULL); + lib_python = Py_DecodeLocale("lib64/platform-python", NULL); if (!_pythonpath || !_prefix || !_exec_prefix || !lib_python) { Py_FatalError( @@ -683,7 +683,7 @@ calculate_path(void) } else wcsncpy(zip_path, _prefix, MAXPATHLEN); - joinpath(zip_path, L"lib/python00.zip"); + joinpath(zip_path, L"lib64/python00.zip"); bufsz = wcslen(zip_path); /* Replace "00" with version */ zip_path[bufsz - 6] = VERSION[0]; zip_path[bufsz - 5] = VERSION[2]; @@ -695,7 +695,7 @@ calculate_path(void) fprintf(stderr, "Could not find platform dependent libraries \n"); wcsncpy(exec_prefix, _exec_prefix, MAXPATHLEN); - joinpath(exec_prefix, L"lib/lib-dynload"); + joinpath(exec_prefix, L"lib64/lib-dynload"); } /* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */ diff --git a/setup.py b/setup.py index fe47797..3e5018a 100644 --- a/setup.py +++ b/setup.py @@ -491,7 +491,7 @@ class PyBuildExt(build_ext): # directories (i.e. '.' and 'Include') must be first. See issue # 10520. if not cross_compiling: - add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') + add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib64') add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') # only change this for cross builds for 3.3, issues on Mageia if cross_compiling: @@ -783,11 +783,11 @@ class PyBuildExt(build_ext): elif curses_library: readline_libs.append(curses_library) elif self.compiler.find_library_file(lib_dirs + - ['/usr/lib/termcap'], + ['/usr/lib64/termcap'], 'termcap'): readline_libs.append('termcap') exts.append( Extension('readline', ['readline.c'], - library_dirs=['/usr/lib/termcap'], + library_dirs=['/usr/lib64/termcap'], extra_link_args=readline_extra_link_args, libraries=readline_libs) ) else: @@ -824,8 +824,8 @@ class PyBuildExt(build_ext): if krb5_h: ssl_incs += krb5_h ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs, - ['/usr/local/ssl/lib', - '/usr/contrib/ssl/lib/' + ['/usr/local/ssl/lib64', + '/usr/contrib/ssl/lib64/' ] ) if (ssl_incs is not None and