Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 8510f43

Browse files
vstinnerJan Matějekmceplstratakis
authored
bpo-1294959: Add sys.platlibdir attribute (GH-18381)
Add --with-platlibdir option to the configure script: name of the platform-specific library directory, stored in the new sys.platlitdir attribute. It is used to build the path of platform-specific dynamic libraries and the path of the standard library. It is equal to "lib" on most platforms. On Fedora and SuSE, it is equal to "lib64" on 64-bit systems. Co-Authored-By: Jan Matějek <[email protected]> Co-Authored-By: Matěj Cepl <[email protected]> Co-Authored-By: Charalampos Stratakis <[email protected]>
1 parent 700cb58 commit 8510f43

16 files changed

Lines changed: 209 additions & 53 deletions

File tree

‎Doc/library/sys.rst‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1138,6 +1138,27 @@ always available.
11381138
system's identity.
11391139

11401140

1141+
.. data:: platlibdir
1142+
1143+
Name of the platform-specific library directory. It is used to build the
1144+
path of platform-specific dynamic libraries and the path of the standard
1145+
library.
1146+
1147+
It is equal to ``"lib"`` on most platforms. On Fedora and SuSE, it is equal
1148+
to ``"lib64"`` on 64-bit platforms which gives the following ``sys.path``
1149+
paths (where ``X.Y`` is the Python ``major.minor`` version):
1150+
1151+
* ``/usr/lib64/pythonX.Y/``:
1152+
Standard library (like ``os.py`` of the :mod:`os` module)
1153+
* ``/usr/lib64/pythonX.Y/lib-dynload/``:
1154+
C extension modules of the standard library (like the :mod:`errno` module,
1155+
the exact filename is platform specific)
1156+
* ``/usr/lib/pythonX.Y/site-packages`` (always use ``lib``, not
1157+
:data:`sys.platlibdir`): Third-party modules
1158+
1159+
.. versionadded:: 3.9
1160+
1161+
11411162
.. data:: prefix
11421163

11431164
A string giving the site-specific directory prefix where the platform

‎Doc/whatsnew/3.9.rst‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -353,6 +353,17 @@ finalization crashed with a Python fatal error if a daemon thread was still
353353
running.
354354
(Contributed by Victor Stinner in :issue:`37266`.)
355355

356+
sys
357+
---
358+
359+
Add a new :attr:`sys.platlitdir` attribute: name of the platform-specific
360+
library directory. It is used to build the path of platform-specific dynamic
361+
libraries and the path of the standard library. It is equal to ``"lib"`` on
362+
most platforms. On Fedora and SuSE, it is equal to ``"lib64"`` on 64-bit
363+
platforms.
364+
(Contributed by Jan Matějek, Matěj Cepl, Charalampos Stratakis and Victor Stinner in :issue:`1294959`.)
365+
366+
356367
typing
357368
------
358369

@@ -390,6 +401,11 @@ Optimizations
390401
Build and C API Changes
391402
=======================
392403

404+
* Add ``--with-platlibdir`` option to the ``configure`` script: name of the
405+
platform-specific library directory, stored in the new :attr:`sys.platlitdir`
406+
attribute. See :attr:`sys.platlibdir` attribute for more information.
407+
(Contributed by Jan Matějek, Matěj Cepl, Charalampos Stratakis and Victor Stinner in :issue:`1294959`.)
408+
393409
* Add a new public :c:func:`PyObject_CallNoArgs` function to the C API, which
394410
calls a callable Python object without any arguments. It is the most efficient
395411
way to call a callable Python object without any argument.

‎Lib/distutils/command/install.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,14 @@
3030
INSTALL_SCHEMES = {
3131
'unix_prefix': {
3232
'purelib': '$base/lib/python$py_version_short/site-packages',
33-
'platlib': '$platbase/lib/python$py_version_short/site-packages',
33+
'platlib': '$platbase/$platlibdir/python$py_version_short/site-packages',
3434
'headers': '$base/include/python$py_version_short$abiflags/$dist_name',
3535
'scripts': '$base/bin',
3636
'data' : '$base',
3737
},
3838
'unix_home': {
3939
'purelib': '$base/lib/python',
40-
'platlib': '$base/lib/python',
40+
'platlib': '$base/$platlibdir/python',
4141
'headers': '$base/include/python/$dist_name',
4242
'scripts': '$base/bin',
4343
'data' : '$base',
@@ -298,6 +298,7 @@ def finalize_options(self):
298298
'sys_exec_prefix': exec_prefix,
299299
'exec_prefix': exec_prefix,
300300
'abiflags': abiflags,
301+
'platlibdir': sys.platlibdir,
301302
}
302303

303304
if HAS_USER_SITE:

‎Lib/distutils/sysconfig.py‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,15 @@ def get_python_lib(plat_specific=0, standard_lib=0, prefix=None):
146146
prefix = plat_specific and EXEC_PREFIX or PREFIX
147147

148148
if os.name == "posix":
149-
libpython = os.path.join(prefix,
150-
"lib", "python" + get_python_version())
149+
if plat_specific or standard_lib:
150+
# Platform-specific modules (any module from a non-pure-Python
151+
# module distribution) or standard Python library modules.
152+
libdir = sys.platlibdir
153+
else:
154+
# Pure Python
155+
libdir = "lib"
156+
libpython = os.path.join(prefix, libdir,
157+
"python" + get_python_version())
151158
if standard_lib:
152159
return libpython
153160
else:

‎Lib/distutils/tests/test_install.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ def check_path(got, expected):
5858

5959
libdir = os.path.join(destination, "lib", "python")
6060
check_path(cmd.install_lib, libdir)
61-
check_path(cmd.install_platlib, libdir)
61+
platlibdir = os.path.join(destination, sys.platlibdir, "python")
62+
check_path(cmd.install_platlib, platlibdir)
6263
check_path(cmd.install_purelib, libdir)
6364
check_path(cmd.install_headers,
6465
os.path.join(destination, "include", "python", "foopkg"))

‎Lib/site.py‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -334,13 +334,22 @@ def getsitepackages(prefixes=None):
334334
continue
335335
seen.add(prefix)
336336

337+
libdirs = [sys.platlibdir]
338+
if sys.platlibdir != "lib":
339+
libdirs.append("lib")
340+
337341
if os.sep == '/':
338-
sitepackages.append(os.path.join(prefix, "lib",
339-
"python%d.%d" % sys.version_info[:2],
340-
"site-packages"))
342+
for libdir in libdirs:
343+
path = os.path.join(prefix, libdir,
344+
"python%d.%d" % sys.version_info[:2],
345+
"site-packages")
346+
sitepackages.append(path)
341347
else:
342348
sitepackages.append(prefix)
343-
sitepackages.append(os.path.join(prefix, "lib", "site-packages"))
349+
350+
for libdir in libdirs:
351+
path = os.path.join(prefix, libdir, "site-packages")
352+
sitepackages.append(path)
344353
return sitepackages
345354

346355
def addsitepackages(known_paths, prefixes=None):

‎Lib/sysconfig.py‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020

2121
_INSTALL_SCHEMES = {
2222
'posix_prefix': {
23-
'stdlib': '{installed_base}/lib/python{py_version_short}',
24-
'platstdlib': '{platbase}/lib/python{py_version_short}',
23+
'stdlib': '{installed_base}/{platlibdir}/python{py_version_short}',
24+
'platstdlib': '{platbase}/{platlibdir}/python{py_version_short}',
2525
'purelib': '{base}/lib/python{py_version_short}/site-packages',
26-
'platlib': '{platbase}/lib/python{py_version_short}/site-packages',
26+
'platlib': '{platbase}/{platlibdir}/python{py_version_short}/site-packages',
2727
'include':
2828
'{installed_base}/include/python{py_version_short}{abiflags}',
2929
'platinclude':
@@ -62,10 +62,10 @@
6262
'data': '{userbase}',
6363
},
6464
'posix_user': {
65-
'stdlib': '{userbase}/lib/python{py_version_short}',
66-
'platstdlib': '{userbase}/lib/python{py_version_short}',
65+
'stdlib': '{userbase}/{platlibdir}/python{py_version_short}',
66+
'platstdlib': '{userbase}/{platlibdir}/python{py_version_short}',
6767
'purelib': '{userbase}/lib/python{py_version_short}/site-packages',
68-
'platlib': '{userbase}/lib/python{py_version_short}/site-packages',
68+
'platlib': '{userbase}/{platlibdir}/python{py_version_short}/site-packages',
6969
'include': '{userbase}/include/python{py_version_short}',
7070
'scripts': '{userbase}/bin',
7171
'data': '{userbase}',
@@ -539,6 +539,7 @@ def get_config_vars(*args):
539539
_CONFIG_VARS['installed_platbase'] = _BASE_EXEC_PREFIX
540540
_CONFIG_VARS['platbase'] = _EXEC_PREFIX
541541
_CONFIG_VARS['projectbase'] = _PROJECT_BASE
542+
_CONFIG_VARS['platlibdir'] = sys.platlibdir
542543
try:
543544
_CONFIG_VARS['abiflags'] = sys.abiflags
544545
except AttributeError:

‎Lib/test/test_embed.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1068,11 +1068,11 @@ def module_search_paths(self, prefix=None, exec_prefix=None):
10681068
else:
10691069
ver = sys.version_info
10701070
return [
1071-
os.path.join(prefix, 'lib',
1071+
os.path.join(prefix, sys.platlibdir,
10721072
f'python{ver.major}{ver.minor}.zip'),
1073-
os.path.join(prefix, 'lib',
1073+
os.path.join(prefix, sys.platlibdir,
10741074
f'python{ver.major}.{ver.minor}'),
1075-
os.path.join(exec_prefix, 'lib',
1075+
os.path.join(exec_prefix, sys.platlibdir,
10761076
f'python{ver.major}.{ver.minor}', 'lib-dynload'),
10771077
]
10781078

@@ -1183,7 +1183,7 @@ def test_init_pyvenv_cfg(self):
11831183

11841184
if not MS_WINDOWS:
11851185
lib_dynload = os.path.join(pyvenv_home,
1186-
'lib',
1186+
sys.platlibdir,
11871187
f'python{ver.major}.{ver.minor}',
11881188
'lib-dynload')
11891189
os.makedirs(lib_dynload)

‎Lib/test/test_site.py‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,11 +266,18 @@ def test_getsitepackages(self):
266266
dirs = site.getsitepackages()
267267
if os.sep == '/':
268268
# OS X, Linux, FreeBSD, etc
269-
self.assertEqual(len(dirs), 1)
269+
if sys.platlibdir != "lib":
270+
self.assertEqual(len(dirs), 2)
271+
wanted = os.path.join('xoxo', sys.platlibdir,
272+
'python%d.%d' % sys.version_info[:2],
273+
'site-packages')
274+
self.assertEqual(dirs[0], wanted)
275+
else:
276+
self.assertEqual(len(dirs), 1)
270277
wanted = os.path.join('xoxo', 'lib',
271278
'python%d.%d' % sys.version_info[:2],
272279
'site-packages')
273-
self.assertEqual(dirs[0], wanted)
280+
self.assertEqual(dirs[-1], wanted)
274281
else:
275282
# other platforms
276283
self.assertEqual(len(dirs), 2)

‎Makefile.pre.in‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,8 @@ LIBDIR= @libdir@
143143
MANDIR= @mandir@
144144
INCLUDEDIR= @includedir@
145145
CONFINCLUDEDIR= $(exec_prefix)/include
146-
SCRIPTDIR= $(prefix)/lib
146+
PLATLIBDIR= @PLATLIBDIR@
147+
SCRIPTDIR= $(prefix)/$(PLATLIBDIR)
147148
ABIFLAGS= @ABIFLAGS@
148149

149150
# Detailed destination directories
@@ -754,6 +755,7 @@ Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile
754755
-DEXEC_PREFIX='"$(exec_prefix)"' \
755756
-DVERSION='"$(VERSION)"' \
756757
-DVPATH='"$(VPATH)"' \
758+
-DPLATLIBDIR='"$(PLATLIBDIR)"' \
757759
-o $@ $(srcdir)/Modules/getpath.c
758760

759761
Programs/python.o: $(srcdir)/Programs/python.c
@@ -785,6 +787,7 @@ Python/dynload_hpux.o: $(srcdir)/Python/dynload_hpux.c Makefile
785787
Python/sysmodule.o: $(srcdir)/Python/sysmodule.c Makefile $(srcdir)/Include/pydtrace.h
786788
$(CC) -c $(PY_CORE_CFLAGS) \
787789
-DABIFLAGS='"$(ABIFLAGS)"' \
790+
-DPLATLIBDIR='"$(PLATLIBDIR)"' \
788791
$(MULTIARCH_CPPFLAGS) \
789792
-o $@ $(srcdir)/Python/sysmodule.c
790793

0 commit comments

Comments
 (0)