Patch 8.0.1692 (after 8.0.1686)
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.
Files: src/configure.ac, src/auto/configure
*** ../vim-8.0.1691/src/configure.ac 2018-04-10 18:13:01.280148327 +0200
--- src/configure.ac 2018-04-10 20:18:53.498231947 +0200
***************
*** 1255,1261 ****
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
dnl Define PYTHON_HOME if --with-python-config-dir was used
PYTHON_CFLAGS="${PYTHON_CFLAGS}
-DPYTHON_HOME='\"${vi_cv_path_python_pfx}\"'"
--- 1255,1261 ----
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" -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,1475 ****
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
dnl Define PYTHON3_HOME if --with-python-config-dir was used
PYTHON3_CFLAGS="${PYTHON3_CFLAGS}
-DPYTHON3_HOME='L\"${vi_cv_path_python3_pfx}\"'"
fi
--- 1469,1475 ----
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" -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
*** ../vim-8.0.1691/src/auto/configure 2018-04-10 18:13:01.280148327 +0200
--- src/auto/configure 2018-04-10 20:20:50.029444814 +0200
***************
*** 6062,6068 ****
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
PYTHON_CFLAGS="${PYTHON_CFLAGS}
-DPYTHON_HOME='\"${vi_cv_path_python_pfx}\"'"
fi
--- 6062,6068 ----
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" -a "$enable_pythoninterp" =
"dynamic"; then
PYTHON_CFLAGS="${PYTHON_CFLAGS}
-DPYTHON_HOME='\"${vi_cv_path_python_pfx}\"'"
fi
***************
*** 6398,6404 ****
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
PYTHON3_CFLAGS="${PYTHON3_CFLAGS}
-DPYTHON3_HOME='L\"${vi_cv_path_python3_pfx}\"'"
fi
PYTHON3_SRC="if_python3.c"
--- 6398,6404 ----
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" -a "$enable_python3interp" =
"dynamic"; then
PYTHON3_CFLAGS="${PYTHON3_CFLAGS}
-DPYTHON3_HOME='L\"${vi_cv_path_python3_pfx}\"'"
fi
PYTHON3_SRC="if_python3.c"
*** ../vim-8.0.1691/src/version.c 2018-04-10 20:06:13.207096004 +0200
--- src/version.c 2018-04-10 20:26:06.099280854 +0200
***************
*** 764,765 ****
--- 764,767 ----
{ /* Add new patch number below this line */
+ /**/
+ 1692,
/**/
--
hundred-and-one symptoms of being an internet addict:
153. You find yourself staring at your "inbox" waiting for new e-mail
to arrive.
/// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
