Date: Mon, 30 Mar 2026 23:52:50 +0000 From: Charlie Li <vishwin@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 851e6d9233d0 - main - devel/meson: update to 1.10.2 Message-ID: <69cb0cd2.41ae4.3cb8d8a8@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=851e6d9233d081bef7b34aea44432369ecb39c02 commit 851e6d9233d081bef7b34aea44432369ecb39c02 Author: Charlie Li <vishwin@FreeBSD.org> AuthorDate: 2026-02-05 06:59:05 +0000 Commit: Charlie Li <vishwin@FreeBSD.org> CommitDate: 2026-03-30 23:49:08 +0000 devel/meson: update to 1.10.2 Changes: https://mesonbuild.com/Release-notes-for-1-10-0.html PR: 287666 exp-run by: antoine --- devel/meson/Makefile | 40 +++++++++++++++++----- devel/meson/distinfo | 6 ++-- .../meson/files/patch-unittests_linuxliketests.py | 13 ------- 3 files changed, 35 insertions(+), 24 deletions(-) diff --git a/devel/meson/Makefile b/devel/meson/Makefile index 7fa71f4ff049..6cf5d18612d1 100644 --- a/devel/meson/Makefile +++ b/devel/meson/Makefile @@ -1,5 +1,5 @@ PORTNAME= meson -PORTVERSION= 1.7.0 +PORTVERSION= 1.10.2 CATEGORIES= devel python MASTER_SITES= https://github.com/mesonbuild/${PORTNAME}/releases/download/${PORTVERSION}/ @@ -10,12 +10,20 @@ WWW= https://mesonbuild.com/ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/COPYING -BUILD_DEPENDS= ${PY_SETUPTOOLS} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools>=42:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-subtests>0:devel/py-pytest-subtests@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}fastjsonschema>0:devel/py-fastjsonschema@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \ + git:devel/git \ + pkg-config:devel/pkgconf \ + rustc:lang/${RUST_DEFAULT} \ + gcc${GCC_DEFAULT}:lang/gcc${GCC_DEFAULT} -USES= ninja:run python shebangfix -USE_PYTHON= autoplist pep517 +USES= ninja:run python shebangfix vala:test +USE_PYTHON= autoplist cython_test pep517 pytest SHEBANG_FILES= mesonbuild/rewriter.py \ mesonbuild/scripts/cmake_run_ctgt.py NO_ARCH= yes @@ -23,20 +31,36 @@ NO_ARCH= yes # https://github.com/mesonbuild/meson/issues/6016 TEST_ENV= ${MAKE_ENV:NCC=*:NCXX=*} +.if make(test) +NO_CCACHE= yes +.endif + # Hide from regular build to avoid accidental dependency on symlinks .if make(test) || ("${WITH_TESTING}" == yes && make(package)) # helper_create_binary_wrapper, test_python_module, test cases/*.py BINARY_ALIAS+= python3=${PYTHON_CMD:T} python=${PYTHON_CMD:T} -do-test: create-binary-alias # force if run late +pre-test: create-binary-alias # force if run late .endif +# test_pkgconfig_formatting separate libintl not expected +# test_static_link pkgconf: Package 'func6' not found +PYTEST_BROKEN_TESTS= test_pkgconfig_formatting \ + test_static_link + .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) +post-patch: + @${REINPLACE_CMD} -e 's|lib/pkgconfig|libdata/pkgconfig|g' \ + -e "s|'lib', 'pkgconfig'|'libdata', 'pkgconfig'|g" \ + -e "s|self.libdir, 'pkgconfig'|'libdata', 'pkgconfig'|g" \ + -e "s|yonder_libdir, 'pkgconfig'|yonder_prefix, 'libdata', 'pkgconfig'|g" \ + ${WRKSRC}/unittests/internaltests.py \ + ${WRKSRC}/unittests/linuxliketests.py + @${REINPLACE_CMD} -e "s|'gcc'|'gcc${GCC_DEFAULT}'|g" \ + ${WRKSRC}/unittests/internaltests.py .include <bsd.port.post.mk> diff --git a/devel/meson/distinfo b/devel/meson/distinfo index 4639661b6141..0b664c36057a 100644 --- a/devel/meson/distinfo +++ b/devel/meson/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1737917263 -SHA256 (meson-1.7.0.tar.gz) = 08efbe84803eed07f863b05092d653a9d348f7038761d900412fddf56deb0284 -SIZE (meson-1.7.0.tar.gz) = 2293975 +TIMESTAMP = 1773929136 +SHA256 (meson-1.10.2.tar.gz) = 7890287d911dd4ee1ebd0efb61ed0321bfcd87c725df923a837cf90c6508f96b +SIZE (meson-1.10.2.tar.gz) = 2422765 diff --git a/devel/meson/files/patch-unittests_linuxliketests.py b/devel/meson/files/patch-unittests_linuxliketests.py deleted file mode 100644 index 0596fb79efa4..000000000000 --- a/devel/meson/files/patch-unittests_linuxliketests.py +++ /dev/null @@ -1,13 +0,0 @@ -https://github.com/mesonbuild/meson/pull/4324 - ---- unittests/linuxliketests.py.orig 2021-10-11 16:26:46 UTC -+++ unittests/linuxliketests.py -@@ -1527,7 +1527,7 @@ class LinuxlikeTests(BasePlatformTests): - # Test that installed libraries works - self.new_builddir() - self.prefix = oldprefix -- meson_args = [f'-Dc_link_args=-L{libdir}', -+ meson_args = [f'-Dc_link_args=-L{libdir} -Wl,-rpath,{libdir}', - '--fatal-meson-warnings'] - testdir = os.path.join(self.unit_test_dir, '67 static link') - env = {'PKG_CONFIG_LIBDIR': os.path.join(libdir, 'pkgconfig')}home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69cb0cd2.41ae4.3cb8d8a8>