diff --git a/devel/meson/Makefile b/devel/meson/Makefile index 43b3469b333f..980505eef92c 100644 --- a/devel/meson/Makefile +++ b/devel/meson/Makefile @@ -1,36 +1,35 @@ # Created by: Ting-Wei Lan PORTNAME= meson -PORTVERSION= 0.60.1 -PORTREVISION= 1 +PORTVERSION= 0.60.2 CATEGORIES= devel python MASTER_SITES= https://github.com/mesonbuild/${PORTNAME}/releases/download/${PORTVERSION}/ MAINTAINER= desktop@FreeBSD.org COMMENT= High performance build system LICENSE= APACHE20 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 SHEBANG_FILES= mesonbuild/rewriter.py \ mesonbuild/scripts/cmake_run_ctgt.py NO_ARCH= yes # https://github.com/mesonbuild/meson/issues/6016 TEST_ENV= ${MAKE_ENV:NCC=*:NCXX=*} # Hide from regular build to avoid accidental dependency on symlinks .if make(test) # 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 .endif do-test: @(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} ${WRKSRC}/run_unittests.py) .include diff --git a/devel/meson/distinfo b/devel/meson/distinfo index 4ad11de5ebde..c63913c2fa52 100644 --- a/devel/meson/distinfo +++ b/devel/meson/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1635886525 -SHA256 (meson-0.60.1.tar.gz) = 5add789c953d984b500858b2851ee3d7add0460cf1a6f852f0a721af17384e13 -SIZE (meson-0.60.1.tar.gz) = 1995258 +TIMESTAMP = 1637875544 +SHA256 (meson-0.60.2.tar.gz) = 64e6968565bf1b8152f4f9d6ca8154efb9e14caa9aabf7b22e71e6c5d053e921 +SIZE (meson-0.60.2.tar.gz) = 1998788 diff --git a/devel/meson/files/patch-mesonbuild_minstall.py b/devel/meson/files/patch-mesonbuild_minstall.py deleted file mode 100644 index cca3919c2978..000000000000 --- a/devel/meson/files/patch-mesonbuild_minstall.py +++ /dev/null @@ -1,16 +0,0 @@ -https://github.com/mesonbuild/meson/issues/9592 - ---- mesonbuild/minstall.py.orig 2021-11-02 19:58:13 UTC -+++ mesonbuild/minstall.py -@@ -247,6 +247,11 @@ def apply_ldconfig(dm: DirMaker) -> None: - ''' - Apply ldconfig to update the ld.so.cache. - ''' -+ from .mesonlib import is_linux -+ if not is_linux(): -+ # Don't blindly assume GNU semantics on other systems -+ return -+ - if not shutil.which('ldconfig'): - # If we don't have ldconfig, failure is ignored quietly. - return