casa / casa-mp-base / 17330f3b45d

Commits

Rainer Müller authored 17330f3b45d 12 Jun 2018

vim, MacVim: Do not link with -framework Python

Using -framework for linking is not correct, as MacPorts provides
multiple versions of Python. This would always pick up the 'port select'
version and not the one request by variants. Restore parts of the patch
for python that were errorneously removed in 00f3dc13b8 and 0dbff7850a.

Incrementing the revision as this change means that the ports might have
linked against the wrong version of python, for example against the
macOS system framework instead of a version provided by MacPorts.

Closes: https://trac.macports.org/ticket/56652

editors/MacVim/files/patch-python.diff

Modified

--
+--- src/configure.ac.orig	2017-11-05 21:24:23.000000000 +0100
--
++++ src/configure.ac	2017-11-09 15:29:12.000000000 +0100
-+
+--- src/configure.ac.orig	2018-05-24 06:33:54.000000000 +0200
-+
++++ src/configure.ac	2018-06-12 18:46:20.000000000 +0200
-3
+@@ -1267,7 +1267,7 @@
-4
+ 	@echo "python_SYSLIBS='$(SYSLIBS)'"
-5
+ 	@echo "python_LINKFORSHARED='$(LINKFORSHARED)'"
-6
+ 	@echo "python_DLLLIBRARY='$(DLLLIBRARY)'"
-7
+-	@echo "python_INSTSONAME='$(INSTSONAME)'"
-8
++	@echo "python_INSTSONAME='$(PYTHONFRAMEWORKPREFIX)/$(INSTSONAME)'"
-9
+ 	@echo "python_PYTHONFRAMEWORK='$(PYTHONFRAMEWORK)'"
-10
+ 	@echo "python_PYTHONFRAMEWORKPREFIX='$(PYTHONFRAMEWORKPREFIX)'"
-11
+ 	@echo "python_PYTHONFRAMEWORKINSTALLDIR='$(PYTHONFRAMEWORKINSTALLDIR)'"
-+
+@@ -1275,13 +1275,6 @@
-+
+ 	    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$MACOS_X" = "xyes" && test -n "${python_PYTHONFRAMEWORK}" && ${vi_cv_path_python} -c \
-+
+-		"import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then
-+
+-	      vi_cv_path_python_plibs="-framework Python"
-+
+-	      if test "x${vi_cv_path_python}" != "x/usr/bin/python" && test -n "${python_PYTHONFRAMEWORKPREFIX}"; then
-+
+-		  vi_cv_path_python_plibs="-F${python_PYTHONFRAMEWORKPREFIX} -framework Python"
-+
+-	      fi
-+
+-	    else
-+
+ 	      vi_cv_path_python_plibs="-L${PYTHON_CONFDIR} -lpython${vi_cv_var_python_version}"
-+
+ 	      dnl -- Check if the path contained in python_LINKFORSHARED is
-+
+ 	      dnl    usable for vim build. If not, make and try other
-+
+@@ -1305,7 +1298,6 @@
-+
+ 	      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
-+
+ 	])
-+
+ 	AC_CACHE_CHECK(Python's dll name,vi_cv_dll_name_python,
-+
+ 	[

casa-mp-base

Commits

Jira Issues

Add shortcut