From owner-svn-ports-head@freebsd.org  Mon Dec 11 12:41:57 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7EE0DE90F22;
 Mon, 11 Dec 2017 12:41:57 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 494C263932;
 Mon, 11 Dec 2017 12:41:57 +0000 (UTC) (envelope-from mat@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id vBBCfutH035672;
 Mon, 11 Dec 2017 12:41:56 GMT (envelope-from mat@FreeBSD.org)
Received: (from mat@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBBCfuxV035671;
 Mon, 11 Dec 2017 12:41:56 GMT (envelope-from mat@FreeBSD.org)
Message-Id: <201712111241.vBBCfuxV035671@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mat set sender to mat@FreeBSD.org
 using -f
From: Mathieu Arnold <mat@FreeBSD.org>
Date: Mon, 11 Dec 2017 12:41:56 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r456026 - head/Mk/Uses
X-SVN-Group: ports-head
X-SVN-Commit-Author: mat
X-SVN-Commit-Paths: head/Mk/Uses
X-SVN-Commit-Revision: 456026
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.25
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 11 Dec 2017 12:41:57 -0000

Author: mat
Date: Mon Dec 11 12:41:56 2017
New Revision: 456026
URL: https://svnweb.freebsd.org/changeset/ports/456026

Log:
  Make USE_PYTHON=concurrent flavors friendly.
  
  Before, it would only create the default symlink if the Python version
  was the default Python version.  Change that to if the Python flavor is
  the default flavor.
  
  PR:		224242
  Sponsored by:	Absolight

Modified:
  head/Mk/Uses/python.mk

Modified: head/Mk/Uses/python.mk
==============================================================================
--- head/Mk/Uses/python.mk	Mon Dec 11 12:19:43 2017	(r456025)
+++ head/Mk/Uses/python.mk	Mon Dec 11 12:41:56 2017	(r456026)
@@ -567,7 +567,9 @@ RUN_DEPENDS+=	cython-${PYTHON_VER}:lang/cython@${PY_FL
 
 .if defined(_PYTHON_FEATURE_CONCURRENT)
 _USES_POST+=		uniquefiles:dirs
-.if ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION}
+.if defined(_PYTHON_FEATURE_FLAVORS) && ${FLAVOR} == ${FLAVORS:[1]}
+UNIQUE_DEFAULT_LINKS=	yes
+.elif !defined(_PYTHON_FEATURE_FLAVORS) && ${PYTHON_VERSION} == ${PYTHON_DEFAULT_VERSION}
 UNIQUE_DEFAULT_LINKS=	yes
 .else
 UNIQUE_DEFAULT_LINKS=	no