Attachment 210285 Details for Bug 241463 – Add flavor to scons port and Mk/Uses

[patch] Add flavor to scons port and Mk/Uses

scons.diff (text/plain), 2.17 KB, created by Ronald Klop on 2019-12-28 15:02:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ronald Klop

Created: 2019-12-28 15:02:05 UTC

Size: 2.17 KB

patch

obsolete

>Index: Mk/Uses/scons.mk
>===================================================================
>--- Mk/Uses/scons.mk	(revision 521221)
>+++ Mk/Uses/scons.mk	(working copy)
>@@ -3,21 +3,38 @@
> # Provide support to use the scons
> #
> # Feature:	scons
>-# Usage:	USES=scons
>+# Usage:	USES=scons:ARGS
>+# Valid ARGS:	2 3
> #
>+# 2:		Use python2 to run scons.
>+# 3:		Use python3 to run scons.
>+#
> # 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
>+# Default to python2 for backwards compatibility.
>+_SCONS_PYTHON_FLAVOR=	${PYTHON2_DEFAULT:S/.//:S/^/py/}
>+
>+_SCONS_ARGS=	${scons_ARGS:S/,/ /g}
>+.if ${_SCONS_ARGS:M2}
>+_SCONS_PYTHON_FLAVOR=	${PYTHON2_DEFAULT:S/.//:S/^/py/}
>+_SCONS_ARGS:=	${_SCONS_ARGS:N2}
> .endif
>+.if ${_SCONS_ARGS:M3}
>+_SCONS_PYTHON_FLAVOR=	${PYTHON3_DEFAULT:S/.//:S/^/py/}
>+_SCONS_ARGS:=	${_SCONS_ARGS:N3}
>+.endif
> 
>-SCONS=		${LOCALBASE}/bin/scons
>+.if !empty(_SCONS_ARGS)
>+IGNORE=	Incorrect 'USES+= scons:${_SCONS_ARGS}' unknown argument
>+.endif
> 
>-BUILD_DEPENDS+=	${SCONS}:devel/scons
>+SCONS=		${LOCALBASE}/bin/scons-${PYTHON_VER}
> 
>+BUILD_DEPENDS+=	${SCONS}:devel/scons@${_SCONS_PYTHON_FLAVOR}
>+
> ALL_TARGET=	#
> CCFLAGS?=	${CFLAGS}
> CPPPATH?=	${LOCALBASE}/include
>Index: devel/scons/Makefile
>===================================================================
>--- devel/scons/Makefile	(revision 521221)
>+++ devel/scons/Makefile	(working copy)
>@@ -5,6 +5,7 @@
> PORTVERSION=	3.1.1
> CATEGORIES=	devel python
> MASTER_SITES=	SF
>+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
> 
> MAINTAINER=	sunpoet@FreeBSD.org
> COMMENT=	Build tool alternative to make
>@@ -14,8 +15,8 @@
> 
> RUN_DEPENDS=	gm4:devel/m4
> 
>-USES=		python:2.7 shebangfix
>-USE_PYTHON=	autoplist distutils
>+USES=		python shebangfix
>+USE_PYTHON=	autoplist concurrent distutils
> 
> NO_ARCH=	yes
> 
>@@ -27,4 +28,6 @@
> 	@${REINPLACE_CMD} -e 's|distutils$\.command\.install$$$|setuptools\1|; s|distutils$\.command\.install\.$|setuptools\1|' ${WRKSRC}/setup.py
> 	@${FIND} ${WRKSRC} -name '*.orig' -delete
> 
>-.include <bsd.port.mk>
>+.include <bsd.port.pre.mk>
>+PYDISTUTILS_INSTALLARGS+=	--standard-lib
>+.include <bsd.port.post.mk>

Flags:

ronald-lists: maintainer-approval?

Actions: View | Diff

Attachments on bug 241463: 208562 | 208563 | 208564 | 208682 | 208730 | 208731 | 210285 | 212879 | 213623