mirror of
https://github.com/torvalds/linux.git
synced 2024-12-11 13:41:55 +00:00
perf python: Avoid deprecation warning on distutils
Fix the following DeprecationWarning: tools/perf/util/setup.py:31: DeprecationWarning: The distutils package is deprecated and slated for removal in Python 3.12. Use setuptools or check PEP 632 for potential alternatives Note: the setuptools module may need installing, for example: $ sudo apt install python-setuptools Reviewer comments: James said: Tested it with python 2.7 and 3.8 by running "make install-python_ext PYTHON=..." Committer notes: Tested with: $ make -k BUILD_BPF_SKEL=1 PYTHON=python3 O=/tmp/build/perf -C tools/perf install-bin ; perf test python $ make -k BUILD_BPF_SKEL=1 O=/tmp/build/perf -C tools/perf install-bin ; perf test python Reviewed-by: James Clark <james.clark@arm.com> Signed-off-by: Ian Rogers <irogers@google.com> Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Mark Rutland <mark.rutland@arm.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Link: https://lore.kernel.org/r/20220615014206.26651-1-irogers@google.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
557cc18ee7
commit
ee87a0841a
@ -11,7 +11,7 @@ def clang_has_option(option):
|
||||
return [o for o in cc_output if ((b"unknown argument" in o) or (b"is not supported" in o))] == [ ]
|
||||
|
||||
if cc_is_clang:
|
||||
from distutils.sysconfig import get_config_vars
|
||||
from sysconfig import get_config_vars
|
||||
vars = get_config_vars()
|
||||
for var in ('CFLAGS', 'OPT'):
|
||||
vars[var] = sub("-specs=[^ ]+", "", vars[var])
|
||||
@ -28,10 +28,10 @@ if cc_is_clang:
|
||||
if not clang_has_option("-ffat-lto-objects"):
|
||||
vars[var] = sub("-ffat-lto-objects", "", vars[var])
|
||||
|
||||
from distutils.core import setup, Extension
|
||||
from setuptools import setup, Extension
|
||||
|
||||
from distutils.command.build_ext import build_ext as _build_ext
|
||||
from distutils.command.install_lib import install_lib as _install_lib
|
||||
from setuptools.command.build_ext import build_ext as _build_ext
|
||||
from setuptools.command.install_lib import install_lib as _install_lib
|
||||
|
||||
class build_ext(_build_ext):
|
||||
def finalize_options(self):
|
||||
|
Loading…
Reference in New Issue
Block a user