--- ./Lib/distutils/command/build_ext.py_orig 2021-12-14 08:20:59 +0000 +++ ./Lib/distutils/command/build_ext.py 2021-12-14 08:22:18 +0000 @@ -262,12 +262,12 @@ # Finally add the user include and library directories if requested if self.user: user_include = os.path.join(USER_BASE, "include") - user_lib = os.path.join(USER_BASE, "lib") + user_lib = os.path.join(USER_BASE, "lib64") if os.path.isdir(user_include): self.include_dirs.append(user_include) - if os.path.isdir(user_lib): - self.library_dirs.append(user_lib) - self.rpath.append(user_lib) + if os.path.isdir(user_lib64): + self.library_dirs.append(user_lib64) + self.rpath.append(user_lib64) if isinstance(self.parallel, str): try: --- ./Lib/distutils/command/install.py_orig 2021-12-14 08:22:34 +0000 +++ ./Lib/distutils/command/install.py 2021-12-14 08:23:18 +0000 @@ -30,14 +30,14 @@ INSTALL_SCHEMES = { 'unix_prefix': { 'purelib': '$base/lib/python$py_version_short/site-packages', - 'platlib': '$platbase/lib/python$py_version_short/site-packages', + 'platlib': '$platbase/lib64/python$py_version_short/site-packages', 'headers': '$base/include/python$py_version_short$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', --- ./Lib/distutils/sysconfig.py_orig 2021-12-14 08:23:36 +0000 +++ ./Lib/distutils/sysconfig.py 2021-12-14 08:25:54 +0000 @@ -147,8 +147,12 @@ prefix = plat_specific and EXEC_PREFIX or PREFIX if os.name == "posix": + if plat_specific: + lib = "lib64" + else: + lib = "lib" libpython = os.path.join(prefix, - "lib", "python" + get_python_version()) + lib, "python" + get_python_version()) if standard_lib: return libpython else: --- ./Lib/site.py_orig 2021-12-14 08:26:10 +0000 +++ ./Lib/site.py 2021-12-14 08:27:58 +0000 @@ -334,11 +334,15 @@ seen.add(prefix) if os.sep == '/': + sitepackages.append(os.path.join(prefix, "lib64", + "python%d.%d" % sys.version_info[:2], + "site-packages")) sitepackages.append(os.path.join(prefix, "lib", "python%d.%d" % sys.version_info[:2], "site-packages")) else: sitepackages.append(prefix) + sitepackages.append(os.path.join(prefix, "lib64", "site-packages")) sitepackages.append(os.path.join(prefix, "lib", "site-packages")) return sitepackages --- ./Lib/sysconfig.py_orig 2021-12-14 08:28:29 +0000 +++ ./Lib/sysconfig.py 2021-12-14 08:30:36 +0000 @@ -21,9 +21,9 @@ _INSTALL_SCHEMES = { 'posix_prefix': { 'stdlib': '{installed_base}/lib/python{py_version_short}', - 'platstdlib': '{platbase}/lib/python{py_version_short}', + 'platstdlib': '{platbase}/lib64/python{py_version_short}', 'purelib': '{base}/lib/python{py_version_short}/site-packages', - 'platlib': '{platbase}/lib/python{py_version_short}/site-packages', + 'platlib': '{platbase}/lib64/python{py_version_short}/site-packages', 'include': '{installed_base}/include/python{py_version_short}{abiflags}', 'platinclude': @@ -33,9 +33,9 @@ }, 'posix_home': { 'stdlib': '{installed_base}/lib/python', - 'platstdlib': '{base}/lib/python', + 'platstdlib': '{base}/lib64/python', 'purelib': '{base}/lib/python', - 'platlib': '{base}/lib/python', + 'platlib': '{base}/lib64/python', 'include': '{installed_base}/include/python', 'platinclude': '{installed_base}/include/python', 'scripts': '{base}/bin', @@ -63,9 +63,9 @@ }, 'posix_user': { 'stdlib': '{userbase}/lib/python{py_version_short}', - 'platstdlib': '{userbase}/lib/python{py_version_short}', + 'platstdlib': '{userbase}/lib64/python{py_version_short}', 'purelib': '{userbase}/lib/python{py_version_short}/site-packages', - 'platlib': '{userbase}/lib/python{py_version_short}/site-packages', + 'platlib': '{userbase}/lib64/python{py_version_short}/site-packages', 'include': '{userbase}/include/python{py_version_short}', 'scripts': '{userbase}/bin', 'data': '{userbase}', --- ./Makefile.pre.in_orig 2021-12-14 08:31:01 +0000 +++ ./Makefile.pre.in 2021-12-14 08:31:22 +0000 @@ -144,7 +144,7 @@ MANDIR= @mandir@ INCLUDEDIR= @includedir@ CONFINCLUDEDIR= $(exec_prefix)/include -SCRIPTDIR= $(prefix)/lib +SCRIPTDIR= $(prefix)/lib64 ABIFLAGS= @ABIFLAGS@ # Detailed destination directories --- ./Modules/getpath.c_orig 2021-12-14 08:31:41 +0000 +++ ./Modules/getpath.c 2021-12-14 08:35:23 +0000 @@ -535,7 +535,7 @@ "Could not find platform dependent libraries \n"); } wcsncpy(exec_prefix, calculate->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.) */ } @@ -783,7 +783,7 @@ else { wcsncpy(calculate->zip_path, calculate->prefix, MAXPATHLEN); } - joinpath(calculate->zip_path, L"lib/python00.zip"); + joinpath(calculate->zip_path, L"lib64/python00.zip"); /* Replace "00" with version */ size_t bufsz = wcslen(calculate->zip_path); @@ -908,7 +908,7 @@ if (!calculate->exec_prefix) { return DECODE_LOCALE_ERR("EXEC_PREFIX define", len); } - calculate->lib_python = Py_DecodeLocale("lib/python" VERSION, &len); + calculate->lib_python = Py_DecodeLocale("lib64/python" VERSION, &len); if (!calculate->lib_python) { return DECODE_LOCALE_ERR("EXEC_PREFIX define", len); } --- ./setup.py_orig 2021-12-14 08:44:14 +0000 +++ ./setup.py 2021-12-14 08:47:10 +0000 @@ -585,7 +585,7 @@ # 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: @@ -891,11 +891,11 @@ 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: --- ./Lib/test/test_site.py_orig 2021-12-14 08:47:24 +0000 +++ ./Lib/test/test_site.py 2021-12-14 08:48:23 +0000 @@ -270,8 +270,8 @@ dirs = site.getsitepackages() if os.sep == '/': # OS X, Linux, FreeBSD, etc - self.assertEqual(len(dirs), 1) - wanted = os.path.join('xoxo', 'lib', + self.assertEqual(len(dirs), 2) + wanted = os.path.join('xoxo', 'lib64', 'python%d.%d' % sys.version_info[:2], 'site-packages') self.assertEqual(dirs[0], wanted)