kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

devel/meson: enable FLAVORs

Browse source 
Needed for devel/meson-python to function on non-default Python
flavours/distributions, as meson is imported as a module. Existing
USES=meson consumers not affected.

Reported by: fluffy
Differential Revision: https://reviews.freebsd.org/D39004
This commit is contained in:
Charlie Li 2023-03-09 14:45:19 -05:00
parent 6153d1b839
commit b883eac8e3
No known key found for this signature in database
GPG key ID: FEB7852BE29B3E87
3 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Mk/Uses/meson.mk
View file

@ -24,7 +24,7 @@ _INCLUDE_USES_MESON_MK= yes
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"

4
devel/meson-python/Makefile
View file

@ -12,9 +12,9 @@ WWW= https://github.com/mesonbuild/meson-python
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

10
devel/meson/Makefile
View file

@ -13,7 +13,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
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 @@ BINARY_ALIAS+= python3=${PYTHON_CMD:T} python=${PYTHON_CMD:T}
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>