Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:coolo:alp:workbench
python38
SUSE-FEDORA-multilib.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File SUSE-FEDORA-multilib.patch of Package python38
--- Lib/distutils/command/install.py | 18 +++++++++--------- Lib/distutils/sysconfig.py | 7 ++----- Lib/site.py | 19 +++++++++---------- Lib/sysconfig.py | 12 ++++++------ Lib/test/test_embed.py | 10 +++++++--- Lib/test/test_site.py | 7 +++++-- Lib/test/test_sysconfig.py | 14 +++++++++++++- Makefile.pre.in | 6 +++++- Modules/getpath.c | 24 ++++++++++++------------ configure | 4 ++-- configure.ac | 18 ++++++++++++++++-- setup.py | 6 +++--- 12 files changed, 89 insertions(+), 56 deletions(-) --- a/Lib/distutils/command/install.py +++ b/Lib/distutils/command/install.py @@ -30,14 +30,14 @@ WINDOWS_SCHEME = { INSTALL_SCHEMES = { 'unix_prefix': { 'purelib': '$base/lib/python$py_version_short/site-packages', - 'platlib': '$platbase/lib64/python$py_version_short/site-packages', + 'platlib': '$platbase/$platsubdir/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/lib64/python', + 'platlib': '$base/lib/python', 'headers': '$base/include/python/$dist_name', 'scripts': '$base/bin', 'data' : '$base', @@ -281,7 +281,7 @@ class install(Command): # about needing recursive variable expansion (shudder). py_version = sys.version.split()[0] - (prefix, exec_prefix) = get_config_vars('prefix', 'exec_prefix') + (prefix, exec_prefix, platsubdir) = get_config_vars('prefix', 'exec_prefix', 'platsubdir') try: abiflags = sys.abiflags except AttributeError: @@ -298,6 +298,7 @@ class install(Command): 'sys_exec_prefix': exec_prefix, 'exec_prefix': exec_prefix, 'abiflags': abiflags, + 'platsubdir': platsubdir, } if HAS_USER_SITE: @@ -419,12 +420,11 @@ class install(Command): "must not supply exec-prefix without prefix") # self.prefix is set to sys.prefix + /local/ - # if neither RPM build nor virtual environment is - # detected to make pip and distutils install packages - # into the separate location. - if (not (hasattr(sys, 'real_prefix') or - sys.prefix != sys.base_prefix) and - 'RPM_BUILD_ROOT' not in os.environ): + # if the executable is /usr/bin/python* and RPM build + # is not detected to make pip and distutils install into + # the separate location. + if (sys.executable.startswith("/usr/bin/python") + and 'RPM_BUILD_ROOT' not in os.environ): addition = "/local" else: addition = "" --- a/Lib/distutils/sysconfig.py +++ b/Lib/distutils/sysconfig.py @@ -146,12 +146,9 @@ def get_python_lib(plat_specific=0, stan prefix = plat_specific and EXEC_PREFIX or PREFIX if os.name == "posix": - if plat_specific or standard_lib: - lib = "lib64" - else: - lib = "lib" + libdir = plat_specific and get_config_var("platsubdir") or "lib" libpython = os.path.join(prefix, - lib, "python" + get_python_version()) + libdir, "python" + get_python_version()) if standard_lib: return libpython else: --- a/Lib/site.py +++ b/Lib/site.py @@ -335,12 +335,18 @@ def getsitepackages(prefixes=None): seen.add(prefix) if os.sep == '/': - sitepackages.append(os.path.join(prefix, "lib64", + from sysconfig import get_config_var + platsubdir = get_config_var("platsubdir") + sitepackages.append(os.path.join(prefix, platsubdir, "python" + sys.version[:3], "site-packages")) - sitepackages.append(os.path.join(prefix, "lib", + sitepackages.append(os.path.join(prefix, platsubdir, "python%d.%d" % sys.version_info[:2], "site-packages")) + if platsubdir != "lib": + 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")) @@ -348,14 +354,7 @@ def getsitepackages(prefixes=None): return sitepackages def addsitepackages(known_paths, prefixes=None): - """Add site-packages to sys.path - - '/usr/local' is included in PREFIXES if RPM build is not detected - to make packages installed into this location visible. - - """ - if ENABLE_USER_SITE and 'RPM_BUILD_ROOT' not in os.environ: - PREFIXES.insert(0, "/usr/local") + """Add site-packages to sys.path""" for sitedir in getsitepackages(prefixes): if os.path.isdir(sitedir): addsitedir(sitedir, known_paths) --- a/Lib/sysconfig.py +++ b/Lib/sysconfig.py @@ -25,10 +25,10 @@ _ALWAYS_STR = { _INSTALL_SCHEMES = { 'posix_prefix': { - 'stdlib': '{installed_base}/lib64/python{py_version_short}', - 'platstdlib': '{platbase}/lib64/python{py_version_short}', + 'stdlib': '{installed_base}/{platsubdir}/python{py_version_short}', + 'platstdlib': '{platbase}/{platsubdir}/python{py_version_short}', 'purelib': '{base}/lib/python{py_version_short}/site-packages', - 'platlib': '{platbase}/lib64/python{py_version_short}/site-packages', + 'platlib': '{platbase}/{platsubdir}/python{py_version_short}/site-packages', 'include': '{installed_base}/include/python{py_version_short}{abiflags}', 'platinclude': @@ -67,10 +67,10 @@ _INSTALL_SCHEMES = { 'data': '{userbase}', }, 'posix_user': { - 'stdlib': '{userbase}/lib64/python{py_version_short}', - 'platstdlib': '{userbase}/lib64/python{py_version_short}', + '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}/lib64/python{py_version_short}/site-packages', + 'platlib': '{userbase}/lib/python{py_version_short}/site-packages', 'include': '{userbase}/include/python{py_version_short}', 'scripts': '{userbase}/bin', 'data': '{userbase}', --- a/Lib/test/test_embed.py +++ b/Lib/test/test_embed.py @@ -10,6 +10,7 @@ import re import shutil import subprocess import sys +import sysconfig import tempfile import textwrap @@ -1072,12 +1073,13 @@ class InitConfigTests(EmbeddingTestsMixi return config['config']['module_search_paths'] else: ver = sys.version_info + platsubdir = sysconfig.get_config_var('platsubdir') return [ os.path.join(prefix, 'lib', f'python{ver.major}{ver.minor}.zip'), - os.path.join(prefix, 'lib', + os.path.join(prefix, platsubdir, f'python{ver.major}.{ver.minor}'), - os.path.join(exec_prefix, 'lib', + os.path.join(exec_prefix, platsubdir, f'python{ver.major}.{ver.minor}', 'lib-dynload'), ] @@ -1188,13 +1190,15 @@ class InitConfigTests(EmbeddingTestsMixi def test_init_pyvenv_cfg(self): # Test path configuration with pyvenv.cfg configuration file + platsubdir = sysconfig.get_config_var('platsubdir') + with self.tmpdir_with_python() as tmpdir, \ tempfile.TemporaryDirectory() as pyvenv_home: ver = sys.version_info if not MS_WINDOWS: lib_dynload = os.path.join(pyvenv_home, - 'lib', + platsubdir, f'python{ver.major}.{ver.minor}', 'lib-dynload') os.makedirs(lib_dynload) --- a/Lib/test/test_site.py +++ b/Lib/test/test_site.py @@ -268,8 +268,11 @@ class HelperFunctionsTests(unittest.Test dirs = site.getsitepackages() if os.sep == '/': # OS X, Linux, FreeBSD, etc - self.assertEqual(len(dirs), 2) - wanted = os.path.join('xoxo', 'lib64', + self.assertTrue(len(dirs) in (1,2,3), + "dirs = {} has len not in (1,2,3).".format(dirs)) + + platsubdir = sysconfig.get_config_var('platsubdir') + wanted = os.path.join('xoxo', platsubdir, 'python%d.%d' % sys.version_info[:2], 'site-packages') self.assertEqual(dirs[0], wanted) --- a/Lib/test/test_sysconfig.py +++ b/Lib/test/test_sysconfig.py @@ -243,6 +243,7 @@ class TestSysConfig(unittest.TestCase): # is similar to the global posix_prefix one base = get_config_var('base') user = get_config_var('userbase') + platsubdir = get_config_var("platsubdir") # the global scheme mirrors the distinction between prefix and # exec-prefix but not the user scheme, so we have to adapt the paths # before comparing (issue #9100) @@ -257,8 +258,19 @@ class TestSysConfig(unittest.TestCase): # before comparing global_path = global_path.replace(sys.base_prefix, sys.prefix) base = base.replace(sys.base_prefix, sys.prefix) + + if platsubdir != "lib": + platbase = os.path.join(base, platsubdir) + purebase = os.path.join(base, "lib") + userlib = os.path.join(user, "lib") + # replace platbase first because usually purebase is a prefix of platbase + # /usr/lib is prefix of /usr/lib64 and would get replaced first + modified_path = global_path.replace(platbase, userlib, 1).replace(purebase, userlib, 1) + else: + modified_path = global_path.replace(base, user, 1) + user_path = get_path(name, 'posix_user') - self.assertEqual(user_path, global_path.replace(base, user, 1)) + self.assertEqual(user_path, modified_path) def test_main(self): # just making sure _main() runs and returns things in the stdout --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -137,13 +137,16 @@ exec_prefix= @exec_prefix@ # Install prefix for data files datarootdir= @datarootdir@ +# Name of "lib" directory under prefix +platsubdir= @platsubdir@ + # Expanded directories BINDIR= @bindir@ LIBDIR= @libdir@ MANDIR= @mandir@ INCLUDEDIR= @includedir@ CONFINCLUDEDIR= $(exec_prefix)/include -SCRIPTDIR= $(prefix)/lib64 +SCRIPTDIR= @libdir@ ABIFLAGS= @ABIFLAGS@ # Detailed destination directories @@ -766,6 +769,7 @@ Modules/getpath.o: $(srcdir)/Modules/get -DEXEC_PREFIX='"$(exec_prefix)"' \ -DVERSION='"$(VERSION)"' \ -DVPATH='"$(VPATH)"' \ + -DPLATLIBDIR='"$(platsubdir)"' \ -o $@ $(srcdir)/Modules/getpath.c Programs/python.o: $(srcdir)/Programs/python.c --- a/Modules/getpath.c +++ b/Modules/getpath.c @@ -55,12 +55,12 @@ * pybuilddir.txt. If the landmark is found, we're done. * * For the remaining steps, the prefix landmark will always be - * lib/python$VERSION/os.py and the exec_prefix will always be - * lib/python$VERSION/lib-dynload, where $VERSION is Python's version - * number as supplied by the Makefile. Note that this means that no more - * build directory checking is performed; if the first step did not find - * the landmarks, the assumption is that python is running from an - * installed setup. + * $lib/python$VERSION/os.py and the exec_prefix will always be + * $lib/python$VERSION/lib-dynload, where $VERSION is Python's version + * number and $lib is PLATLIBDIR as supplied by the Makefile. Note that + * this means that no more build directory checking is performed; if the + * first step did not find the landmarks, the assumption is that python + * is running from an installed setup. * * Step 2. See if the $PYTHONHOME environment variable points to the * installed location of the Python libraries. If $PYTHONHOME is set, then @@ -86,7 +86,7 @@ * containing the shared library modules is appended. The environment * variable $PYTHONPATH is inserted in front of it all. Finally, the * prefix and exec_prefix globals are tweaked so they reflect the values - * expected by other code, by stripping the "lib/python$VERSION/..." stuff + * expected by other code, by stripping the "$lib/python$VERSION/..." stuff * off. If either points to the build directory, the globals are reset to * the corresponding preprocessor variables (so sys.prefix will reflect the * installation location, even though sys.path points into the build @@ -105,8 +105,8 @@ extern "C" { #endif -#if !defined(PREFIX) || !defined(EXEC_PREFIX) || !defined(VERSION) || !defined(VPATH) -#error "PREFIX, EXEC_PREFIX, VERSION, and VPATH must be constant defined" +#if !defined(PREFIX) || !defined(EXEC_PREFIX) || !defined(VERSION) || !defined(VPATH) || !defined(PLATLIBDIR) +#error "PREFIX, EXEC_PREFIX, VERSION, VPATH, and PLATLIBDIR must be constant defined" #endif #ifndef LANDMARK @@ -730,7 +730,7 @@ calculate_exec_prefix(PyCalculatePath *c if (safe_wcscpy(exec_prefix, calculate->exec_prefix, exec_prefix_len) < 0) { return PATHLEN_ERR(); } - status = joinpath(exec_prefix, L"lib64/lib-dynload", exec_prefix_len); + status = joinpath(exec_prefix, L"lib/lib-dynload", exec_prefix_len); if (_PyStatus_EXCEPTION(status)) { return status; } @@ -1063,7 +1063,7 @@ calculate_zip_path(PyCalculatePath *calc return PATHLEN_ERR(); } } - status = joinpath(zip_path, L"lib64/python00.zip", zip_path_len); + status = joinpath(zip_path, L"lib/python00.zip", zip_path_len); if (_PyStatus_EXCEPTION(status)) { return status; } @@ -1193,7 +1193,7 @@ calculate_init(PyCalculatePath *calculat if (!calculate->exec_prefix) { return DECODE_LOCALE_ERR("EXEC_PREFIX define", len); } - calculate->lib_python = Py_DecodeLocale("lib64/python" VERSION, &len); + calculate->lib_python = Py_DecodeLocale(PLATLIBDIR "/python" VERSION, &len); if (!calculate->lib_python) { return DECODE_LOCALE_ERR("EXEC_PREFIX define", len); } --- a/configure +++ b/configure @@ -15264,9 +15264,9 @@ fi if test x$PLATFORM_TRIPLET = x; then - LIBPL='$(prefix)'"/lib64/python${VERSION}/config-${LDVERSION}" + LIBPL='$(prefix)'"/${platsubdir}/python${VERSION}/config-${LDVERSION}" else - LIBPL='$(prefix)'"/lib64/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}" + LIBPL='$(prefix)'"/${platsubdir}/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}" fi --- a/configure.ac +++ b/configure.ac @@ -4719,12 +4719,26 @@ else LIBPYTHON='' fi +# platsubdir must be defined before LIBPL definition +AC_MSG_CHECKING(for custom platsubdir) +AC_ARG_WITH(custom-platsubdir, + [AS_HELP_STRING([--with-custom-platsubdir=<libdirname>], + [set the platsubdir name to a custom string])], + [], + [with_custom_platsubdir=yes]) +AS_CASE($with_custom_platsubdir, + [yes],[platsubdir=`basename ${libdir}`], + [no],[platsubdir=lib], + [platsubdir=$with_custom_platsubdir]) +AC_MSG_RESULT($platsubdir) +AC_SUBST(platsubdir) + dnl define LIBPL after ABIFLAGS and LDVERSION is defined. AC_SUBST(PY_ENABLE_SHARED) if test x$PLATFORM_TRIPLET = x; then - LIBPL='$(prefix)'"/lib64/python${VERSION}/config-${LDVERSION}" + LIBPL='$(prefix)'"/${platsubdir}/python${VERSION}/config-${LDVERSION}" else - LIBPL='$(prefix)'"/lib64/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}" + LIBPL='$(prefix)'"/${platsubdir}/python${VERSION}/config-${LDVERSION}-${PLATFORM_TRIPLET}" fi AC_SUBST(LIBPL) --- a/setup.py +++ b/setup.py @@ -634,7 +634,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/lib64') + add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') 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: @@ -938,11 +938,11 @@ class PyBuildExt(build_ext): elif curses_library: readline_libs.append(curses_library) elif self.compiler.find_library_file(self.lib_dirs + - ['/usr/lib64/termcap'], + ['/usr/lib/termcap'], 'termcap'): readline_libs.append('termcap') self.add(Extension('readline', ['readline.c'], - library_dirs=['/usr/lib64/termcap'], + library_dirs=['/usr/lib/termcap'], extra_link_args=readline_extra_link_args, libraries=readline_libs)) else:
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
