Skip to content

Commit

Permalink
modules: python: better handling of the Python paths for Debian
Browse files Browse the repository at this point in the history
Hardcoding the name is fragile, and enabling it based on the existence of
/etc/debian_version (as the is_debianlike helper does) will result in
incorrect paths if the Python binary is not provided by Debian.

Using the deb_system distuils scheme instead makes sure we use the
install path from the current interpreter, which Debian could change
between releases, and gives us the correct value on Python installations
that are not provided by Debian (eg. deadsnakes, Github Action Python,
etc.)

Do notice, though, that there is still no guarantee that these are the
correct paths, as they assume all schemes paths have the install prefix
as a base, see #9284.

Signed-off-by: Filipe Laíns <[email protected]>
  • Loading branch information
FFY00 authored and xclaesse committed Sep 29, 2021
1 parent 6ef3946 commit 05b5a1e
Showing 1 changed file with 35 additions and 8 deletions.
43 changes: 35 additions & 8 deletions mesonbuild/modules/python.py
Original file line number Diff line number Diff line change
Expand Up @@ -276,11 +276,43 @@ def set_env(name, value):


INTROSPECT_COMMAND = '''\
import os.path
import sysconfig
import json
import sys
install_paths = sysconfig.get_paths(vars={'base': '', 'platbase': '', 'installed_base': ''})
import distutils.command.install
def get_distutils_paths(scheme=None, prefix=None):
import distutils.dist
distribution = distutils.dist.Distribution()
install_cmd = distribution.get_command_obj('install')
if prefix is not None:
install_cmd.prefix = prefix
if scheme:
install_cmd.select_scheme(scheme)
install_cmd.finalize_options()
return {
'data': install_cmd.install_data,
'include': os.path.dirname(install_cmd.install_headers),
'platlib': install_cmd.install_platlib,
'purelib': install_cmd.install_purelib,
'scripts': install_cmd.install_scripts,
}
# On Debian derivatives, the Python interpreter shipped by the distribution uses
# a custom install scheme, deb_system, for the system install, and changes the
# default scheme to a custom one pointing to /usr/local and replacing
# site-packages with dist-packages.
# See https://github.com/mesonbuild/meson/issues/8739.
# XXX: We should be using sysconfig, but Debian only patches distutils.
if 'deb_system' in distutils.command.install.INSTALL_SCHEMES:
paths = get_distutils_paths(scheme='deb_system')
install_paths = get_distutils_paths(scheme='deb_system', prefix='')
else:
paths = sysconfig.get_paths()
empty_vars = {'base': '', 'platbase': '', 'installed_base': ''}
install_paths = sysconfig.get_paths(vars=empty_vars)
def links_against_libpython():
from distutils.core import Distribution, Extension
Expand All @@ -290,7 +322,7 @@ def links_against_libpython():
print(json.dumps({
'variables': sysconfig.get_config_vars(),
'paths': sysconfig.get_paths(),
'paths': paths,
'install_paths': install_paths,
'sys_paths': sys.path,
'version': sysconfig.get_python_version(),
Expand Down Expand Up @@ -373,14 +405,9 @@ def _get_path(self, key: str) -> None:
sys_paths = self.info['sys_paths']
rel_path = self.info['install_paths'][key][1:]
if not any(p.endswith(rel_path) for p in sys_paths if not p.startswith(user_dir)):
# On Debian derivatives sysconfig install path is broken and is not
# included in the locations python actually lookup.
# See https://github.com/mesonbuild/meson/issues/8739.
mlog.warning('Broken python installation detected. Python files',
'installed by Meson might not be found by python interpreter.',
once=True)
if mesonlib.is_debianlike():
rel_path = 'lib/python3/dist-packages'
return rel_path


Expand Down

0 comments on commit 05b5a1e

Please sign in to comment.