From owner-svn-ports-all@freebsd.org Mon May 25 18:31:42 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9763D32EB26; Mon, 25 May 2020 18:31:42 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49W5KB0Fkvz4K0W; Mon, 25 May 2020 18:31:41 +0000 (UTC) (envelope-from sunpoet@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0921516B33; Mon, 25 May 2020 18:31:41 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 04PIVe3H054396; Mon, 25 May 2020 18:31:40 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 04PIVeZn054395; Mon, 25 May 2020 18:31:40 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <202005251831.04PIVeZn054395@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Mon, 25 May 2020 18:31:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r536495 - head/Mk/Uses X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: head/Mk/Uses X-SVN-Commit-Revision: 536495 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 25 May 2020 18:31:43 -0000 Author: sunpoet Date: Mon May 25 18:31:40 2020 New Revision: 536495 URL: https://svnweb.freebsd.org/changeset/ports/536495 Log: Add Python flavor support USES=scons:python2 usage is a temporary solution for ports using Python 2. It will be removed when all consumers moved to Python 3. Or it will go away with Python 2 removal by December 31, 2020. Modified: head/Mk/Uses/scons.mk Modified: head/Mk/Uses/scons.mk ============================================================================== --- head/Mk/Uses/scons.mk Mon May 25 18:31:34 2020 (r536494) +++ head/Mk/Uses/scons.mk Mon May 25 18:31:40 2020 (r536495) @@ -3,22 +3,36 @@ # Provide support to use the scons # # Feature: scons -# Usage: USES=scons +# Usage: USES=scons[:ARGS] +# Valid ARGS: python2 python3 # +# python2: Use default python 2.x to run scons +# python3: Use default python 3.x to run scons (default) +# # MAINTAINER: python@FreeBSD.org .if !defined(_INCLUDE_USES_SCONS_MK) _INCLUDE_USES_SCONS_MK= yes -.if !empty(scons_ARGS) -IGNORE= Incorrect 'USES+= scons:${scons_ARGS}' scons takes no arguments +.if empty(scons_ARGS) +scons_ARGS= python3 .endif -SCONS= ${LOCALBASE}/bin/scons +.if ${scons_ARGS} == python3 +_SCONS_PYTHON_VER= ${PYTHON3_DEFAULT} +.elif ${scons_ARGS} == python2 +_SCONS_PYTHON_VER= ${PYTHON2_DEFAULT} +.else +IGNORE= Incorrect 'USES+= scons:${scons_ARGS}' usage +.endif -BUILD_DEPENDS+= ${SCONS}:devel/scons +_SCONS_PYTHON_FLAVOR= py${_SCONS_PYTHON_VER:S|.||} -ALL_TARGET= # +SCONS= ${LOCALBASE}/bin/scons-${_SCONS_PYTHON_VER} + +BUILD_DEPENDS+= ${SCONS}:devel/scons@${_SCONS_PYTHON_FLAVOR} + +ALL_TARGET?= # CCFLAGS?= ${CFLAGS} CPPPATH?= ${LOCALBASE}/include LIBPATH?= ${LOCALBASE}/lib