D39004.id118591.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D39004.id118591.diff
View Options

	Index: Mk/Uses/meson.mk
	===================================================================
	--- Mk/Uses/meson.mk
	+++ Mk/Uses/meson.mk
	@@ -24,7 +24,7 @@
	IGNORE= Incorrect 'USES+= meson:${meson_ARGS}'. meson takes no arguments
	. endif

	-BUILD_DEPENDS+= meson>=0.57.1_1:devel/meson
	+BUILD_DEPENDS+= meson:devel/meson

	# meson uses ninja
	.include "${USESDIR}/ninja.mk"
	Index: devel/meson/Makefile
	===================================================================
	--- devel/meson/Makefile
	+++ devel/meson/Makefile
	@@ -13,7 +13,7 @@
	TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR}

	USES= ninja:run python:3.6+ shebangfix
	-USE_PYTHON= autoplist distutils noflavors
	+USE_PYTHON= autoplist distutils
	SHEBANG_FILES= mesonbuild/rewriter.py \
	mesonbuild/scripts/cmake_run_ctgt.py
	NO_ARCH= yes
	@@ -28,7 +28,13 @@
	do-test: create-binary-alias # force if run late
	.endif

	+.include <bsd.port.pre.mk>
	+
	+.if ${PYTHON_VER} != ${PYTHON_DEFAULT}
	+PKGNAMESUFFIX= ${PYTHON_PKGNAMESUFFIX}
	+.endif
	+
	do-test:
	@(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} ${WRKSRC}/run_unittests.py)

	-.include <bsd.port.mk>
	+.include <bsd.port.post.mk>