diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-04-10 20:26:20 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-04-10 20:26:20 +0200 |
| commit | 3a21d9c7bb4d58cccd2152e319daa8f8ffa2e664 (patch) | |
| tree | 1e6f1e24259c940e428151ef65a3f07661ee1b72 | |
| parent | 164268d4cf84fa0efd984fddbef4a41366aabd46 (diff) | |
patch 8.0.1692: Python may not work when using statically linked libraryv8.0.1692
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.
| -rwxr-xr-x | src/auto/configure | 4 | ||||
| -rw-r--r-- | src/configure.ac | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/auto/configure b/src/auto/configure index 838129db85..56d5a9dd4b 100755 --- 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 e2867b422e..4e71de3312 100644 --- 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 8e446d91b4..6a8cd23604 100644 --- a/src/version.c +++ b/src/version.c @@ -763,6 +763,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1692, +/**/ 1691, /**/ 1690, |