Page MenuHomeFreeBSD
Files F137310570

D39004.id118595.diff
No OneTemporary
Actions

D39004.id118595.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-python/Makefile
===================================================================
--- devel/meson-python/Makefile
+++ devel/meson-python/Makefile
@@ -12,9 +12,9 @@
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
-BUILD_DEPENDS= meson>=0.63.3:devel/meson \
+BUILD_DEPENDS= meson:devel/meson@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pyproject-metadata>=0.6.1:devel/py-pyproject-metadata@${PY_FLAVOR}
-RUN_DEPENDS= meson>=0.63.3:devel/meson \
+RUN_DEPENDS= meson:devel/meson@${PY_FLAVOR} \
${PYTHON_PKGNAMEPREFIX}pyproject-metadata>=0.6.1:devel/py-pyproject-metadata@${PY_FLAVOR}
USES= python
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>

File Metadata

Mime Type
text/plain
Expires
Sun, Nov 23, 8:02 AM (19 h, 5 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
26008870
Default Alt Text
D39004.id118595.diff (1 KB)

Event Timeline