Ticket #41344: vim-python-linkage.diff

File vim-python-linkage.diff, 2.9 KB (added by raimue (Rainer Müller), 11 years ago)
  • files/patch-python.diff

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

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