# HG changeset patch # User Bram Moolenaar # Date 1680715807 -7200 # Node ID 8f4aa24617c276e746abb2ca598b74b69ad61adb # Parent a2680fb16a24f625c4d6bd30ef1cac949fa4a828 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 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) diff --git a/src/auto/configure b/src/auto/configure --- 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 diff --git a/src/configure.ac b/src/configure.ac --- 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 diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1441, +/**/ 1440, /**/ 1439,