To: vim_dev@googlegroups.com
Subject: Patch 9.0.1441
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 9.0.1441
Problem:    MacOS: Python 3 using framework do not set dll name properly.
Solution:   Use the framework prefix. (Yee Cheng Chin, closes #12189)
Files:      src/configure.ac, src/auto/configure


*** ../vim-9.0.1440/src/configure.ac	2023-03-31 21:28:57.363659525 +0100
--- src/configure.ac	2023-04-05 18:18:54.879083228 +0100
***************
*** 1584,1589 ****
--- 1584,1590 ----
  	@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,1603 ****
--- 1599,1606 ----
  	[
  	  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
*** ../vim-9.0.1440/src/auto/configure	2023-03-31 21:28:57.363659525 +0100
--- src/auto/configure	2023-04-05 18:21:12.211537552 +0100
***************
*** 6865,6870 ****
--- 6865,6871 ----
  	@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,6888 ****
--- 6884,6891 ----
  
  	  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
*** ../vim-9.0.1440/src/version.c	2023-04-04 22:04:48.169318284 +0100
--- src/version.c	2023-04-05 18:21:04.035513970 +0100
***************
*** 697,698 ****
--- 697,700 ----
  {   /* Add new patch number below this line */
+ /**/
+     1441,
  /**/

-- 
FATHER: We are here today to witness the union of two young people in the
        joyful bond of the holy wedlock.  Unfortunately, one of them, my son
        Herbert, has just fallen to his death.
   [Murmurs from CROWD;  the BRIDE smiles with relief, coughs.]
                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///                                                                      \\\
\\\        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///