Attachment 225282 Details for Bug 256150 – Patch

[patch] Patch

scons.patch (text/plain), 1.28 KB, created by Dmitry Marakasov on 2021-05-26 16:20:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2021-05-26 16:20:09 UTC

Size: 1.28 KB

patch

obsolete

>commit 6b5a70eee1b3615c4990762d9b647e56003180af
>Author: Dmitry Marakasov <amdmi3@FreeBSD.org>
>Date:   Wed May 26 18:11:43 2021 +0300
>
>    Mk/Uses/scons.mk: remove support for python2
>    
>    PR:             256170
>    Differential Revision:  https://reviews.freebsd.org/D30472
>
>diff --git Mk/Uses/scons.mk Mk/Uses/scons.mk
>index edb603ad7d8d..8c598a6983dc 100644
>--- Mk/Uses/scons.mk
>+++ 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|.||}
>

Actions: View | Diff

Attachments on bug 256150: 225249 | 225282 | 225285