Skip to content

Commit 0424958

Browse files
committed
patch 8.0.1683: Python upgrade breaks Vim when defining PYTHON_HOME
Problem: Python upgrade breaks Vim when defining PYTHON_HOME. Solution: Do not define PYTHON_HOME and PYTHON3_HOME in configure. (Naoki Inada, closes #2787)
1 parent 8c87a2b commit 0424958

3 files changed

Lines changed: 10 additions & 8 deletions

File tree

src/auto/configure

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6058,9 +6058,9 @@ $as_echo "$vi_cv_dll_name_python" >&6; }
60586058

60596059
PYTHON_LIBS="${vi_cv_path_python_plibs}"
60606060
if test "${vi_cv_path_python_pfx}" = "${vi_cv_path_python_epfx}"; then
6061-
PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME='\"${vi_cv_path_python_pfx}\"'"
6061+
PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version}"
60626062
else
6063-
PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -I${vi_cv_path_python_epfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME='\"${vi_cv_path_python_pfx}\"'"
6063+
PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -I${vi_cv_path_python_epfx}/include/python${vi_cv_var_python_version}"
60646064
fi
60656065
PYTHON_SRC="if_python.c"
60666066
PYTHON_OBJ="objects/if_python.o"
@@ -6390,9 +6390,9 @@ $as_echo "$vi_cv_dll_name_python3" >&6; }
63906390

63916391
PYTHON3_LIBS="${vi_cv_path_python3_plibs}"
63926392
if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then
6393-
PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME='L\"${vi_cv_path_python3_pfx}\"'"
6393+
PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}"
63946394
else
6395-
PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -I${vi_cv_path_python3_epfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME='L\"${vi_cv_path_python3_pfx}\"'"
6395+
PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -I${vi_cv_path_python3_epfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}"
63966396
fi
63976397
PYTHON3_SRC="if_python3.c"
63986398
PYTHON3_OBJ="objects/if_python3.o"

src/configure.ac

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1251,9 +1251,9 @@ eof
12511251

12521252
PYTHON_LIBS="${vi_cv_path_python_plibs}"
12531253
if test "${vi_cv_path_python_pfx}" = "${vi_cv_path_python_epfx}"; then
1254-
PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME='\"${vi_cv_path_python_pfx}\"'"
1254+
PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version}"
12551255
else
1256-
PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -I${vi_cv_path_python_epfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME='\"${vi_cv_path_python_pfx}\"'"
1256+
PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -I${vi_cv_path_python_epfx}/include/python${vi_cv_var_python_version}"
12571257
fi
12581258
PYTHON_SRC="if_python.c"
12591259
PYTHON_OBJ="objects/if_python.o"
@@ -1460,9 +1460,9 @@ eof
14601460

14611461
PYTHON3_LIBS="${vi_cv_path_python3_plibs}"
14621462
if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then
1463-
PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME='L\"${vi_cv_path_python3_pfx}\"'"
1463+
PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}"
14641464
else
1465-
PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -I${vi_cv_path_python3_epfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME='L\"${vi_cv_path_python3_pfx}\"'"
1465+
PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -I${vi_cv_path_python3_epfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags}"
14661466
fi
14671467
PYTHON3_SRC="if_python3.c"
14681468
PYTHON3_OBJ="objects/if_python3.o"

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -762,6 +762,8 @@ static char *(features[]) =
762762

763763
static int included_patches[] =
764764
{ /* Add new patch number below this line */
765+
/**/
766+
1683,
765767
/**/
766768
1682,
767769
/**/

0 commit comments

Comments
 (0)