Mercurial > vim
changeset 32220:8f4aa24617c2 v9.0.1441
patch 9.0.1441: MacOS: Python 3 using framework do not set dll name properly
Commit: https://github.com/vim/vim/commit/b6ebe5af74a965d703eb8ee66a07c97b0bbe6e58
Author: Yee Cheng Chin <ychin.git@gmail.com>
Date: Wed Apr 5 18:24:50 2023 +0100
patch 9.0.1441: MacOS: Python 3 using framework do not set dll name properly
Problem: MacOS: Python 3 using framework do not set dll name properly.
Solution: Use the framework prefix. (Yee Cheng Chin, closes https://github.com/vim/vim/issues/12189)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Wed, 05 Apr 2023 19:30:07 +0200 |
parents | a2680fb16a24 |
children | 622cba617159 |
files | src/auto/configure src/configure.ac src/version.c |
diffstat | 3 files changed, 8 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/auto/configure +++ b/src/auto/configure @@ -6865,6 +6865,7 @@ else @echo "python3_SYSLIBS='$(SYSLIBS)'" @echo "python3_DLLLIBRARY='$(DLLLIBRARY)'" @echo "python3_INSTSONAME='$(INSTSONAME)'" + @echo "python3_PYTHONFRAMEWORKPREFIX='$(PYTHONFRAMEWORKPREFIX)'" eof eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`" rm -f -- "${tmp_mkf}" @@ -6883,6 +6884,8 @@ else if test "X$python3_DLLLIBRARY" != "X"; then vi_cv_dll_name_python3="$python3_DLLLIBRARY" + elif test "X$python3_PYTHONFRAMEWORKPREFIX" != "X"; then + vi_cv_dll_name_python3="${python3_PYTHONFRAMEWORKPREFIX}/${python3_INSTSONAME}" else vi_cv_dll_name_python3="$python3_INSTSONAME" fi
--- a/src/configure.ac +++ b/src/configure.ac @@ -1584,6 +1584,7 @@ if test "$enable_python3interp" = "yes" @echo "python3_SYSLIBS='$(SYSLIBS)'" @echo "python3_DLLLIBRARY='$(DLLLIBRARY)'" @echo "python3_INSTSONAME='$(INSTSONAME)'" + @echo "python3_PYTHONFRAMEWORKPREFIX='$(PYTHONFRAMEWORKPREFIX)'" eof dnl -- delete the lines from make about Entering/Leaving directory eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`" @@ -1598,6 +1599,8 @@ eof [ if test "X$python3_DLLLIBRARY" != "X"; then vi_cv_dll_name_python3="$python3_DLLLIBRARY" + elif test "X$python3_PYTHONFRAMEWORKPREFIX" != "X"; then + vi_cv_dll_name_python3="${python3_PYTHONFRAMEWORKPREFIX}/${python3_INSTSONAME}" else vi_cv_dll_name_python3="$python3_INSTSONAME" fi