Last active
March 11, 2016 07:38
-
-
Save ntezak/9130115 to your computer and use it in GitHub Desktop.
Patch for homebrew formula to build macvim with anaconda's (or another non-system/non-framework) python distribution
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/configure.in b/src/configure.in | |
| index e57be41..7606d1f 100644 | |
| --- a/src/configure.in | |
| +++ b/src/configure.in | |
| @@ -1011,9 +1011,14 @@ AC_ARG_ENABLE(pythoninterp, | |
| [enable_pythoninterp="no"]) | |
| AC_MSG_RESULT($enable_pythoninterp) | |
| if test "$enable_pythoninterp" = "yes" -o "$enable_pythoninterp" = "dynamic"; then | |
| - dnl -- find the python executable | |
| - AC_PATH_PROGS(vi_cv_path_python, python2 python) | |
| - if test "X$vi_cv_path_python" != "X"; then | |
| + dnl -- find the python executable | |
| + dnl AC_PATH_PROGS(vi_cv_path_python, python2 python) | |
| + AC_MSG_CHECKING(--with-python argument) | |
| + AC_ARG_WITH(python, [ --with-python=PATH which python to use (default: python)], | |
| + python_name="$withval"; AC_MSG_RESULT($python_name), | |
| + python_name="python"; AC_MSG_RESULT(no)) | |
| + AC_SUBST(vi_cv_path_python, $python_name) | |
| + if test "X$vi_cv_path_python" != "X"; then | |
| dnl -- get its version number | |
| AC_CACHE_CHECK(Python version,vi_cv_var_python_version, | |
| @@ -1096,30 +1101,28 @@ 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}" | |
| - if test "x$MACOSX" = "xyes" && ${vi_cv_path_python} -c \ | |
| - "import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then | |
| - vi_cv_path_python_plibs="-framework Python" | |
| - else | |
| - if test "${vi_cv_var_python_version}" = "1.4"; then | |
| - vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a" | |
| - else | |
| - vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}" | |
| - fi | |
| - vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}" | |
| - dnl remove -ltermcap, it can conflict with an earlier -lncurses | |
| - vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//` | |
| - fi | |
| +dnl if test "x$MACOSX" = "xyes" && ${vi_cv_path_python} -c \ | |
| +dnl "import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then | |
| +dnl vi_cv_path_python_plibs="-framework Python" | |
| +dnl else | |
| +dnl if test "${vi_cv_var_python_version}" = "1.4"; then | |
| +dnl vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a" | |
| +dnl else | |
| +dnl vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}" | |
| +dnl fi | |
| +dnl vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}" | |
| +dnl dnl remove -ltermcap, it can conflict with an earlier -lncurses | |
| +dnl vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//` | |
| +dnl fi | |
| + vi_cv_path_python_plibs="`${vi_cv_path_python}-config --ldflags`" | |
| + dnl remove -ltermcap, it can conflict with an earlier -lncurses | |
| + vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//` | |
| ]) | |
| if test "X$python_DLLLIBRARY" != "X"; then | |
| python_INSTSONAME="$python_DLLLIBRARY" | |
| fi | |
| - PYTHON_LIBS="${vi_cv_path_python_plibs}" | |
| - if test "${vi_cv_path_python_pfx}" = "${vi_cv_path_python_epfx}"; then | |
| - PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME='\"${vi_cv_path_python_pfx}\"'" | |
| - else | |
| - PYTHON_CFLAGS="-I${vi_cv_path_python_pfx}/include/python${vi_cv_var_python_version} -I${vi_cv_path_python_epfx}/include/python${vi_cv_var_python_version} -DPYTHON_HOME='\"${vi_cv_path_python_pfx}\"'" | |
| - fi | |
| + PYTHON_CFLAGS="`${vi_cv_path_python}-config --includes` -DPYTHON_HOME='\"${vi_cv_path_python_pfx}\"'" | |
| PYTHON_SRC="if_python.c" | |
| PYTHON_OBJ="objects/if_python.o" | |
| if test "${vi_cv_var_python_version}" = "1.4"; then |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Hi. Found this fine patch, but am unsure on how to apply it? Where can I actually find the configure.in file for a brew package?