From owner-dev-commits-ports-all@freebsd.org Wed May 26 19:03:54 2021 Return-Path: Delivered-To: dev-commits-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 8D7AC643736; Wed, 26 May 2021 19:03:54 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Fr0jQ3QG4z4Vg1; Wed, 26 May 2021 19:03:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 398181645D; Wed, 26 May 2021 19:03:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 14QJ3snG032631; Wed, 26 May 2021 19:03:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14QJ3sAh032630; Wed, 26 May 2021 19:03:54 GMT (envelope-from git) Date: Wed, 26 May 2021 19:03:54 GMT Message-Id: <202105261903.14QJ3sAh032630@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: bd9b99277f42 - main - Mk/Uses/scons.mk: Clean up after the removal of all scons:python2 usage MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bd9b99277f42573d15ed4fd4eb9b83b62bc1cb0c Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 May 2021 19:03:54 -0000 The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=bd9b99277f42573d15ed4fd4eb9b83b62bc1cb0c commit bd9b99277f42573d15ed4fd4eb9b83b62bc1cb0c Author: Dmitry Marakasov AuthorDate: 2021-05-26 18:56:29 +0000 Commit: Po-Chuan Hsieh CommitDate: 2021-05-26 19:00:22 +0000 Mk/Uses/scons.mk: Clean up after the removal of all scons:python2 usage PR: 256170 Differential Revision: https://reviews.freebsd.org/D30472 --- Mk/Uses/scons.mk | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/Mk/Uses/scons.mk b/Mk/Uses/scons.mk index edb603ad7d8d..8c598a6983dc 100644 --- a/Mk/Uses/scons.mk +++ b/Mk/Uses/scons.mk @@ -1,30 +1,19 @@ # Provide support to use the scons # # Feature: 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) +# Usage: USES=scons +# Valid ARGS: none # # MAINTAINER: python@FreeBSD.org .if !defined(_INCLUDE_USES_SCONS_MK) _INCLUDE_USES_SCONS_MK= yes -.if empty(scons_ARGS) -scons_ARGS= python3 -.endif +. if !empty(scons_ARGS) +IGNORE+= USES=scons takes no arguments +. endif -.if ${scons_ARGS} == python3 _SCONS_PYTHON_VER= ${PYTHON3_DEFAULT} -.elif ${scons_ARGS} == python2 -_SCONS_PYTHON_VER= ${PYTHON2_DEFAULT} -DEPRECATED?= Uses Python 2.7 version of scons, and Python 2.7 which is EOLed upstream -EXPIRATION_DATE?= 2020-12-31 -.else -IGNORE= Incorrect 'USES+= scons:${scons_ARGS}' usage -.endif _SCONS_PYTHON_FLAVOR= py${_SCONS_PYTHON_VER:S|.||}