aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 9.0.1441: MacOS: Python 3 using framework do not set dll name properly

Browse Source 
Problem:    MacOS: Python 3 using framework do not set dll name properly.
Solution:   Use the framework prefix. (Yee Cheng Chin, closes #12189)
This commit is contained in:
Yee Cheng Chin 2023-04-05 18:24:50 +01:00 committed by Bram Moolenaar
parent 23a971da50
commit b6ebe5af74
3 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/auto/configure vendored
View File

@ -6865,6 +6865,7 @@ __:
@echo "python3_SYSLIBS='$(SYSLIBS)'" @echo "python3_SYSLIBS='$(SYSLIBS)'"
@echo "python3_DLLLIBRARY='$(DLLLIBRARY)'" @echo "python3_DLLLIBRARY='$(DLLLIBRARY)'"
@echo "python3_INSTSONAME='$(INSTSONAME)'" @echo "python3_INSTSONAME='$(INSTSONAME)'"
@echo "python3_PYTHONFRAMEWORKPREFIX='$(PYTHONFRAMEWORKPREFIX)'"
eof eof
eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`" eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
rm -f -- "${tmp_mkf}" rm -f -- "${tmp_mkf}"
@ -6883,6 +6884,8 @@ else
if test "X$python3_DLLLIBRARY" != "X"; then if test "X$python3_DLLLIBRARY" != "X"; then
vi_cv_dll_name_python3="$python3_DLLLIBRARY" vi_cv_dll_name_python3="$python3_DLLLIBRARY"
elif test "X$python3_PYTHONFRAMEWORKPREFIX" != "X"; then
vi_cv_dll_name_python3="${python3_PYTHONFRAMEWORKPREFIX}/${python3_INSTSONAME}"
else else
vi_cv_dll_name_python3="$python3_INSTSONAME" vi_cv_dll_name_python3="$python3_INSTSONAME"
fi fi

3
src/configure.ac
View File

@ -1584,6 +1584,7 @@ __:
@echo "python3_SYSLIBS='$(SYSLIBS)'" @echo "python3_SYSLIBS='$(SYSLIBS)'"
@echo "python3_DLLLIBRARY='$(DLLLIBRARY)'" @echo "python3_DLLLIBRARY='$(DLLLIBRARY)'"
@echo "python3_INSTSONAME='$(INSTSONAME)'" @echo "python3_INSTSONAME='$(INSTSONAME)'"
@echo "python3_PYTHONFRAMEWORKPREFIX='$(PYTHONFRAMEWORKPREFIX)'"
eof eof
dnl -- delete the lines from make about Entering/Leaving directory dnl -- delete the lines from make about Entering/Leaving directory
eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`" eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
@ -1598,6 +1599,8 @@ eof
[ [
if test "X$python3_DLLLIBRARY" != "X"; then if test "X$python3_DLLLIBRARY" != "X"; then
vi_cv_dll_name_python3="$python3_DLLLIBRARY" vi_cv_dll_name_python3="$python3_DLLLIBRARY"
elif test "X$python3_PYTHONFRAMEWORKPREFIX" != "X"; then
vi_cv_dll_name_python3="${python3_PYTHONFRAMEWORKPREFIX}/${python3_INSTSONAME}"
else else
vi_cv_dll_name_python3="$python3_INSTSONAME" vi_cv_dll_name_python3="$python3_INSTSONAME"
fi fi

2
src/version.c
View File

@ -695,6 +695,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1441,
/**/ /**/
1440, 1440,
/**/ /**/