source: trunk/dports/editors/vim/files/patch-python3.diff @ 110123

Last change on this file since 110123 was 110123, checked in by raimue@…, 6 years ago

editors/vim, editors/vim-app, editors/MacVim:
Fix linking with +python27, which failed silently before, closes #39207.
Also ensure we are always using the correct tclsh binary.

Thanks to larryv@ for the patches.

File size: 2.3 KB
  • src/configure.in

    old new  
    11621152AC_MSG_RESULT($enable_python3interp)
    11631153if test "$enable_python3interp" = "yes" -o "$enable_python3interp" = "dynamic"; then
    11641154  dnl -- find the python3 executable
    1165   AC_PATH_PROGS(vi_cv_path_python3, python3 python)
     1155  AC_MSG_CHECKING(--with-python3 argument)
     1156  AC_ARG_WITH(python3, [  --with-python3=PATH       which python to use (default: python3)],
     1157        python_name="$withval"; AC_MSG_RESULT($python_name),
     1158        python_name="python3"; AC_MSG_RESULT(no))
     1159  AC_SUBST(vi_cv_path_python3, $python_name)
    11661160  if test "X$vi_cv_path_python3" != "X"; then
    11671161
    11681162    dnl -- get its version number
     
    12571251          dnl -- delete the lines from make about Entering/Leaving directory
    12581252          eval "`cd ${PYTHON3_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`"
    12591253          rm -f -- "${tmp_mkf}"
    1260           vi_cv_path_python3_plibs="-L${PYTHON3_CONFDIR} -lpython${vi_cv_var_python3_version}"
    1261           vi_cv_path_python3_plibs="${vi_cv_path_python3_plibs} ${python3_BASEMODLIBS} ${python3_LIBS} ${python3_SYSLIBS}"
     1254          vi_cv_path_python3_plibs="`${vi_cv_path_python3}-config --ldflags`"
    12621255          dnl remove -ltermcap, it can conflict with an earlier -lncurses
    12631256          vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-ltermcap//`
    12641257          vi_cv_path_python3_plibs=`echo $vi_cv_path_python3_plibs | sed s/-lffi//`
     
    12681261       python3_INSTSONAME="$python3_DLLLIBRARY"
    12691262      fi
    12701263      PYTHON3_LIBS="${vi_cv_path_python3_plibs}"
    1271       if test "${vi_cv_path_python3_pfx}" = "${vi_cv_path_python3_epfx}"; then
    1272         PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\""
    1273       else
    1274         PYTHON3_CFLAGS="-I${vi_cv_path_python3_pfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -I${vi_cv_path_python3_epfx}/include/python${vi_cv_var_python3_version}${vi_cv_var_python3_abiflags} -DPYTHON3_HOME=L\\\"${vi_cv_path_python3_pfx}\\\""
    1275       fi
     1264      PYTHON3_CFLAGS="`${vi_cv_path_python3}-config --includes` -DPYTHON3_HOME='L\"${vi_cv_path_python3_pfx}\"'"
    12761265      PYTHON3_SRC="if_python3.c"
    12771266      PYTHON3_OBJ="objects/if_python3.o"
    12781267
Note: See TracBrowser for help on using the repository browser.