thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.2970: Python configure check uses deprecated command

Browse Source 
Problem:    Python configure check uses deprecated command.
Solution:   Use sysconfig instead of distutils if possible. (Zdenek Dohnal,
            closes #8354)
This commit is contained in:
Zdenek Dohnal
2021-06-10 18:50:55 +02:00
committed by Bram Moolenaar
parent a42e6e0082
commit 31e299c08f
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/auto/configure vendored
View File

@@ -6755,7 +6755,10 @@ else
vi_cv_path_python3_conf= vi_cv_path_python3_conf=
config_dir="config-${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}" config_dir="config-${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}"
d=`${vi_cv_path_python3} -c "import sysconfig; print(sysconfig.get_config_var('LIBPL'))" 2> /dev/null`
if test "x$d" = "x"; then
d=`${vi_cv_path_python3} -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBPL'))"` d=`${vi_cv_path_python3} -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBPL'))"`
fi
if test -d "$d" && test -f "$d/config.c"; then if test -d "$d" && test -f "$d/config.c"; then
vi_cv_path_python3_conf="$d" vi_cv_path_python3_conf="$d"
else else

3
src/configure.ac
View File

@@ -1487,7 +1487,10 @@ if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic";
[ [
vi_cv_path_python3_conf= vi_cv_path_python3_conf=
config_dir="config-${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}" config_dir="config-${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}"
d=`${vi_cv_path_python3} -c "import sysconfig; print(sysconfig.get_config_var('LIBPL'))" 2> /dev/null`
if test "x$d" = "x"; then
d=`${vi_cv_path_python3} -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBPL'))"` d=`${vi_cv_path_python3} -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBPL'))"`
fi
if test -d "$d" && test -f "$d/config.c"; then if test -d "$d" && test -f "$d/config.c"; then
vi_cv_path_python3_conf="$d" vi_cv_path_python3_conf="$d"
else else

2
src/version.c
View File

@@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
2970,
/**/ /**/
2969, 2969,
/**/ /**/