From nobody Sat Mar 11 16:36:57 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4PYpV211ccz3xpx0; Sat, 11 Mar 2023 16:36:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4PYpV20SScz3Q94; Sat, 11 Mar 2023 16:36:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678552618; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qpMv3Ld7DrONmsO8wRP5aRq4USRsS9xNECYtCOP/jS8=; b=uyMz+yrHBF2bBEJggUhKkCPVx1jUcxuEvCUXdgkHCC/a13r4FYNr53DUdL9SI28KqILp60 PIxKh5riyJ8/HCZ8sUN0ARd8Ogua1NVeczKlW9KlP7zWTILAgrKCNh3AlMWTeymwOgaTM2 ZpPZbVB7M6plXIFy/+a6iY4C8twjYLgBkxYGSWZTjdXfMopguCLVuuuvOOd4Agy8XejUg/ T+I424vxWDXwqQ/bSmgUk3bzl7lS4tDJCaP5rRK7ZkMeDi65j+LfemXTSS5U80puyH7K9m kS9k5oHpjATemq74r+WigcSEtpEm0yKevDqd8eLAKhARfZznRH3KsiqbghY5JQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1678552618; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qpMv3Ld7DrONmsO8wRP5aRq4USRsS9xNECYtCOP/jS8=; b=gr2vNH1QEVPWA/nfwuXsQ852FFBq5j08IfBILDyNcfjkzJrazpOrrRA4wiK77TfIoJR3p+ /GkgEQGdh+KipE/qmi7RjL96OpzxWYs9vwlmLm5JEir0b+Ji4+Z+WUWIREE149yfxm3aYv TZ8vC5+unwgBhxU+N6EsMtMHCA9kLbmlgmw2oSX27Xg5waxSUBOvjjM/XfwwNdd4Yitl/Z dH3w7IqFv8PjyxdChAaeZcMwekjVfd0CT/GPjdoHef7QCp1oYMXOFSWgbGlUbkookMEsMM o4bWE/41YWpcxX7yka+qd4sIyquz5jT3/b6kXDoqISCxrAv4TBhy3AVdYNOxCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1678552618; a=rsa-sha256; cv=none; b=JMy6/R379A13aI+5ZFGgYk8IAu5hKP/Ju5C59xX7EADaYj7B2qnbO2nQaqyD+/IBXevJ/H 5GvKXGqAWa3I0geQxaXCzghpIeGTKCqfqdMJgW1YhXt711GJtqEZgRBLD8SE5iQJw3h0Nr g3i9Sipqs4vKRtc5ZTP+VqWRYaZ14njWWVnHBs3ynIDoKHj9RndT5R9oYVv4+EuqzPQGZH 47QtTrpYiKzRmOUH7GC8sProLE5zCR4Sk6AE9FXu1VHMq0QcyYsNky17Y4ngt9aqf/GNNy uc07drwqjCrO3t/2qKq7INZXDxHR68BuDwnRNGHRYC45dxN5NqMW371WMHBBIQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4PYpV16bd1zctC; Sat, 11 Mar 2023 16:36:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 32BGavZQ071834; Sat, 11 Mar 2023 16:36:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32BGavvS071833; Sat, 11 Mar 2023 16:36:57 GMT (envelope-from git) Date: Sat, 11 Mar 2023 16:36:57 GMT Message-Id: <202303111636.32BGavvS071833@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Charlie Li Subject: git: b883eac8e32d - main - devel/meson: enable FLAVORs List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vishwin X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b883eac8e32d2187ad18a7247699f77084cf0f06 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=b883eac8e32d2187ad18a7247699f77084cf0f06 commit b883eac8e32d2187ad18a7247699f77084cf0f06 Author: Charlie Li AuthorDate: 2023-03-09 19:45:19 +0000 Commit: Charlie Li CommitDate: 2023-03-11 16:35:57 +0000 devel/meson: enable FLAVORs 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 --- Mk/Uses/meson.mk | 2 +- devel/meson-python/Makefile | 4 ++-- devel/meson/Makefile | 10 ++++++++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/Mk/Uses/meson.mk b/Mk/Uses/meson.mk index 4411bb5b9f7b..9affd4b9ed4e 100644 --- a/Mk/Uses/meson.mk +++ b/Mk/Uses/meson.mk @@ -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" diff --git a/devel/meson-python/Makefile b/devel/meson-python/Makefile index 283d6ce78041..144ee459712a 100644 --- a/devel/meson-python/Makefile +++ b/devel/meson-python/Makefile @@ -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 diff --git a/devel/meson/Makefile b/devel/meson/Makefile index 00d2889f4baf..83793c5990b8 100644 --- a/devel/meson/Makefile +++ b/devel/meson/Makefile @@ -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 + +.if ${PYTHON_VER} != ${PYTHON_DEFAULT} +PKGNAMESUFFIX= ${PYTHON_PKGNAMESUFFIX} +.endif + do-test: @(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} ${WRKSRC}/run_unittests.py) -.include +.include