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 #12189)
diff --git a/src/auto/configure b/src/auto/configure
index ba5a074..57e498f 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 @@
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 94e1863..ec4141d 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 @@
[
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 853ea5f..856eb46 100644
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1441,
+/**/
1440,
/**/
1439,