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.

diff --git a/src/auto/configure b/src/auto/configure
index 838129db85dbd03fb2dab7d8ad3a40c883a5d2a0..56d5a9dd4ba8859ded17c0c30244349f6233ef56 100755 (executable)
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -6062,7 +6062,7 @@ $as_echo "$vi_cv_dll_name_python" >&6; }
        else
          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}"
        fi
-       if test "X$have_python_config_dir" = "X1"; then
+       if test "X$have_python_config_dir" = "X1" -a "$enable_pythoninterp" = "dynamic"; then
                  PYTHON_CFLAGS="${PYTHON_CFLAGS} -DPYTHON_HOME='\"${vi_cv_path_python_pfx}\"'"
 
        fi
@@ -6398,7 +6398,7 @@ $as_echo "$vi_cv_dll_name_python3" >&6; }
         else
           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}"
         fi
-       if test "X$have_python3_config_dir" = "X1"; then
+       if test "X$have_python3_config_dir" = "X1" -a "$enable_python3interp" = "dynamic"; then
                  PYTHON3_CFLAGS="${PYTHON3_CFLAGS}  -DPYTHON3_HOME='L\"${vi_cv_path_python3_pfx}\"'"
        fi
         PYTHON3_SRC="if_python3.c"

diff --git a/src/configure.ac b/src/configure.ac
index e2867b422e264c1567dd0550a9f155dcd8a6075e..4e71de3312e6482828088788381406abbbcacca7 100644 (file)
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -1255,7 +1255,7 @@ eof
        else
          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}"
        fi
-       if test "X$have_python_config_dir" = "X1"; then
+       if test "X$have_python_config_dir" = "X1" -a "$enable_pythoninterp" = "dynamic"; then
          dnl Define PYTHON_HOME if --with-python-config-dir was used
          PYTHON_CFLAGS="${PYTHON_CFLAGS} -DPYTHON_HOME='\"${vi_cv_path_python_pfx}\"'"
 
@@ -1469,7 +1469,7 @@ eof
         else
           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}"
         fi
-       if test "X$have_python3_config_dir" = "X1"; then
+       if test "X$have_python3_config_dir" = "X1" -a "$enable_python3interp" = "dynamic"; then
          dnl Define PYTHON3_HOME if --with-python-config-dir was used
          PYTHON3_CFLAGS="${PYTHON3_CFLAGS}  -DPYTHON3_HOME='L\"${vi_cv_path_python3_pfx}\"'"
        fi

diff --git a/src/version.c b/src/version.c
index 8e446d91b45a38722ba365041b71f11555ba91cc..6a8cd236043e4293253802c1812d0f14a7ca3389 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1692,
 /**/
     1691,
 /**/