diff --git a/dev-util/meson/meson-0.50.0.recipe b/dev-util/meson/meson-0.50.1.recipe similarity index 90% rename from dev-util/meson/meson-0.50.0.recipe rename to dev-util/meson/meson-0.50.1.recipe index c47abf40c..27fd308e2 100644 --- a/dev-util/meson/meson-0.50.0.recipe +++ b/dev-util/meson/meson-0.50.1.recipe @@ -4,11 +4,10 @@ build system." HOMEPAGE="https://mesonbuild.com/" COPYRIGHT="2013-2019 The Meson development team" LICENSE="Apache v2" -REVISION="2" +REVISION="1" SOURCE_URI="https://github.com/mesonbuild/meson/releases/download/$portVersion/meson-$portVersion.tar.gz" -CHECKSUM_SHA256="2a1bc42dda58206fb922cda5e1ca95cc03ad126321d26acc47d3493ec4e7021f" -PATCHES="meson-$portVersion.patchset" -PYTHON_VERSION="3.6" +CHECKSUM_SHA256="f68f56d60c80a77df8fc08fa1016bc5831605d4717b622c96212573271e14ecc" +PYTHON_VERSION="3.7" ARCHITECTURES="any" diff --git a/dev-util/meson/patches/meson-0.50.0.patchset b/dev-util/meson/patches/meson-0.50.0.patchset deleted file mode 100644 index 1688ee129..000000000 --- a/dev-util/meson/patches/meson-0.50.0.patchset +++ /dev/null @@ -1,25 +0,0 @@ -From 9737a81fbcd3ff9471868393735c703335bb9963 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= -Date: Tue, 12 Mar 2019 03:39:42 +0100 -Subject: [PATCH] Properly detect 'bepc' as 'x86' CPU for Haiku - ---- - mesonbuild/environment.py | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py -index 08324632..74ce058c 100644 ---- a/mesonbuild/environment.py -+++ b/mesonbuild/environment.py -@@ -204,6 +204,8 @@ def detect_cpu_family(compilers): - trial = platform.machine().lower() - if trial.startswith('i') and trial.endswith('86'): - trial = 'x86' -+ elif trial == 'bepc': -+ trial = 'x86' - elif trial.startswith('arm'): - trial = 'arm' - elif trial.startswith('ppc64'): --- -2.20.1 -