From a9e3fb368f6d275d9361ee177a930e633b861971 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 31 Oct 2022 10:43:35 +0100 Subject: [PATCH 1/2] meson: update to 0.64.0rc1. --- srcpkgs/meson/template | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/srcpkgs/meson/template b/srcpkgs/meson/template index aea31234fd19..4a7e7797037f 100644 --- a/srcpkgs/meson/template +++ b/srcpkgs/meson/template @@ -1,6 +1,6 @@ # Template file for 'meson' pkgname=meson -version=0.63.2 +version=0.64.0rc1 revision=1 build_style=python3-module hostmakedepends="python3-devel python3-setuptools" @@ -13,8 +13,8 @@ maintainer="Michal Vasilek " license="Apache-2.0" homepage="https://mesonbuild.com" changelog="https://github.com/mesonbuild/meson/blob/master/docs/markdown/Release-notes-for-${version%.*}.0.md" -distfiles="https://github.com/mesonbuild/meson/releases/download/$version/$pkgname-$version.tar.gz" -checksum=16222f17ef76be0542c91c07994f9676ae879f46fc21c0c786a21ef2cb518bbf +distfiles="https://github.com/mesonbuild/meson/releases/download/${version}/meson-${version}.tar.gz" +checksum=12d8f2c54c81c0db3ce2113c1efc4861392500685aea1edcb9771f9ad629396d # XXX: sanitizers aren't available on musl if [ "$XBPS_TARGET_LIBC" = glibc ]; then From da5b511027b4ad49b2ae5c1f7bf43fd94bcb6260 Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Mon, 31 Oct 2022 12:06:46 +0100 Subject: [PATCH 2/2] common: build-style/meson: use meson setup --- common/build-style/meson.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/build-style/meson.sh b/common/build-style/meson.sh index a7bd901e9760..e983c5f42c2f 100644 --- a/common/build-style/meson.sh +++ b/common/build-style/meson.sh @@ -103,7 +103,7 @@ do_configure() { export AR="gcc-ar" # unbuffered output for continuous logging - PYTHONUNBUFFERED=1 ${meson_cmd} \ + PYTHONUNBUFFERED=1 ${meson_cmd} setup \ --prefix=/usr \ --libdir=/usr/lib${XBPS_TARGET_WORDSIZE} \ --libexecdir=/usr/libexec \