Skip to content

Commit 3a21d9c

Browse files
committed
patch 8.0.1692: Python may not work when using statically linked library
Problem: Python may not work when using statically linked library . Solution: Do not define PYTHON_HOME and PYTHON3_HOME in configure if the Python library is linked statically.
1 parent 164268d commit 3a21d9c

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

src/auto/configure

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6062,7 +6062,7 @@ $as_echo "$vi_cv_dll_name_python" >&6; }
60626062
else
60636063
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
6065-
if test "X$have_python_config_dir" = "X1"; then
6065+
if test "X$have_python_config_dir" = "X1" -a "$enable_pythoninterp" = "dynamic"; then
60666066
PYTHON_CFLAGS="${PYTHON_CFLAGS} -DPYTHON_HOME='\"${vi_cv_path_python_pfx}\"'"
60676067

60686068
fi
@@ -6398,7 +6398,7 @@ $as_echo "$vi_cv_dll_name_python3" >&6; }
63986398
else
63996399
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}"
64006400
fi
6401-
if test "X$have_python3_config_dir" = "X1"; then
6401+
if test "X$have_python3_config_dir" = "X1" -a "$enable_python3interp" = "dynamic"; then
64026402
PYTHON3_CFLAGS="${PYTHON3_CFLAGS} -DPYTHON3_HOME='L\"${vi_cv_path_python3_pfx}\"'"
64036403
fi
64046404
PYTHON3_SRC="if_python3.c"

src/configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1255,7 +1255,7 @@ eof
12551255
else
12561256
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
1258-
if test "X$have_python_config_dir" = "X1"; then
1258+
if test "X$have_python_config_dir" = "X1" -a "$enable_pythoninterp" = "dynamic"; then
12591259
dnl Define PYTHON_HOME if --with-python-config-dir was used
12601260
PYTHON_CFLAGS="${PYTHON_CFLAGS} -DPYTHON_HOME='\"${vi_cv_path_python_pfx}\"'"
12611261

@@ -1469,7 +1469,7 @@ eof
14691469
else
14701470
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}"
14711471
fi
1472-
if test "X$have_python3_config_dir" = "X1"; then
1472+
if test "X$have_python3_config_dir" = "X1" -a "$enable_python3interp" = "dynamic"; then
14731473
dnl Define PYTHON3_HOME if --with-python-config-dir was used
14741474
PYTHON3_CFLAGS="${PYTHON3_CFLAGS} -DPYTHON3_HOME='L\"${vi_cv_path_python3_pfx}\"'"
14751475
fi

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+
1692,
765767
/**/
766768
1691,
767769
/**/

0 commit comments

Comments
 (0)