Date: Sun, 3 Dec 2017 20:03:09 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r455426 - head/Mk/Uses Message-ID: <201712032003.vB3K39RR042156@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Sun Dec 3 20:03:09 2017 New Revision: 455426 URL: https://svnweb.freebsd.org/changeset/ports/455426 Log: Fix default python flavor wrt python version There's a flaw in FLAVOR selection logic which makes python FLAVOR default to py27 even with DEFAULT_VERSIONS=python=3.6. Fix this and generate FLAVOR based on PYTHON_DEFAULT, PYTHON2_DEFAULT, PYTHON3_DEFAULT (in that order) similar to how it's done in other parts of python.mk. This does not affect FLAVOR in default setup (py27 remains), but if python default version is modified, it will now properly affect FLAVOR. Approved by: portmgr (antoine) Differential Revision: D13326 Modified: head/Mk/Uses/python.mk Modified: head/Mk/Uses/python.mk ============================================================================== --- head/Mk/Uses/python.mk Sun Dec 3 19:39:23 2017 (r455425) +++ head/Mk/Uses/python.mk Sun Dec 3 20:03:09 2017 (r455426) @@ -426,8 +426,8 @@ FLAVORS= ${_ALL_PYTHON_FLAVORS} . else . for _v in ${PYTHON3_DEFAULT} ${PYTHON2_DEFAULT} ${PYTHON_DEFAULT} _f= py${_v:S/.//} -. if ${_ALL_PYTHON_FLAVORS:M${_f}} && !${FLAVORS:M${_f}} -FLAVORS:= ${_f} ${FLAVORS} +. if ${_ALL_PYTHON_FLAVORS:M${_f}} +FLAVORS:= ${_f} ${FLAVORS:N${_f}} . endif . endfor . endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712032003.vB3K39RR042156>