Ticket #41344: vim-python-linkage.diff

files/patch-python.diff

@@ -1 @@
---- src/configure.in.orig       2013-08-04 20:00:50.000000000 +0200
-+++ src/configure.in    2013-09-22 20:28:50.000000000 +0200
-@@ -965,7 +965,11 @@
+--- src/configure.in.orig       2013-11-14 18:09:08.000000000 +0100
++++ src/configure.in    2013-11-14 18:09:08.000000000 +0100
+@@ -988,7 +988,11 @@
  AC_MSG_RESULT($enable_pythoninterp)
  if test "$enable_pythoninterp" = "yes" -o "$enable_pythoninterp" = "dynamic"; then
    dnl -- find the python executable
@@ -13 +13 @@
    if test "X$vi_cv_path_python" != "X"; then
  
      dnl -- get its version number
-@@ -1049,30 +1053,16 @@
+@@ -1067,35 +1071,21 @@
+        @echo "python_SYSLIBS='$(SYSLIBS)'"
+        @echo "python_LINKFORSHARED='$(LINKFORSHARED)'"
+        @echo "python_DLLLIBRARY='$(DLLLIBRARY)'"
+-       @echo "python_INSTSONAME='$(INSTSONAME)'"
++       @echo "python_INSTSONAME='$(PYTHONFRAMEWORKPREFIX)/$(INSTSONAME)'"
+ eof
             dnl -- delete the lines from make about Entering/Leaving directory
             eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
             rm -f -- "${tmp_mkf}"

files/patch-python3.diff

@@ -1 @@
---- src/configure.in.orig       2013-08-04 20:00:50.000000000 +0200
-+++ src/configure.in    2013-09-22 20:35:45.000000000 +0200
-@@ -1162,7 +1162,11 @@
+--- src/configure.in.orig       2013-11-14 18:13:09.000000000 +0100
++++ src/configure.in    2013-11-14 18:13:10.000000000 +0100
+@@ -1185,7 +1185,11 @@
  AC_MSG_RESULT($enable_python3interp)
  if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic"; then
    dnl -- find the python3 executable
@@ -13 +13 @@
    if test "X$vi_cv_path_python3" != "X"; then
  
      dnl -- get its version number
-@@ -1257,8 +1261,7 @@
+@@ -1275,13 +1279,12 @@
+        @echo "python3_LIBS='$(LIBS)'"
+        @echo "python3_SYSLIBS='$(SYSLIBS)'"
+        @echo "python3_DLLLIBRARY='$(DLLLIBRARY)'"
+-       @echo "python3_INSTSONAME='$(INSTSONAME)'"
++       @echo "python3_INSTSONAME='$(PYTHONFRAMEWORKPREFIX)/$(INSTSONAME)'"
+ eof
              dnl -- delete the lines from make about Entering/Leaving directory
              eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
              rm -f -- "${tmp_mkf}"
@@ -23 +29 @@
              dnl remove -ltermcap, it can conflict with an earlier -lncurses
              vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-ltermcap//`
              vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-lffi//`
-@@ -1268,11 +1271,7 @@
+@@ -1291,11 +1294,7 @@
           python3_INSTSONAME="$python3_DLLLIBRARY"
          fi
          PYTHON3_LIBS="${vi_cv_path_python3_plibs}"