diff options
| author | Yee Cheng Chin <ychin.git@gmail.com> | 2023-04-05 18:24:50 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2023-04-05 18:24:50 +0100 |
| commit | b6ebe5af74a965d703eb8ee66a07c97b0bbe6e58 (patch) | |
| tree | 2206b7d36e29e5c055e1852288077e28d6ae5f99 | |
| parent | 23a971da506249fc8388f06cd5c011b83406ac5c (diff) | |
| download | vim-git-b6ebe5af74a965d703eb8ee66a07c97b0bbe6e58.tar.gz | |
patch 9.0.1441: MacOS: Python 3 using framework do not set dll name properlyv9.0.1441
Problem: MacOS: Python 3 using framework do not set dll name properly.
Solution: Use the framework prefix. (Yee Cheng Chin, closes #12189)
| -rwxr-xr-x | src/auto/configure | 3 | ||||
| -rw-r--r-- | src/configure.ac | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/src/auto/configure b/src/auto/configure index ba5a0744c..57e498fc6 100755 --- a/src/auto/configure +++ b/src/auto/configure @@ -6865,6 +6865,7 @@ __: @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 index 94e186382..ec4141dc8 100644 --- a/src/configure.ac +++ b/src/configure.ac @@ -1584,6 +1584,7 @@ __: @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 index 853ea5f18..856eb4666 100644 --- 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, |