diff --git a/dev-util/meson/meson-0.48.2.recipe b/dev-util/meson/meson-0.48.2.recipe index 831c17505..9d11053a6 100644 --- a/dev-util/meson/meson-0.48.2.recipe +++ b/dev-util/meson/meson-0.48.2.recipe @@ -4,9 +4,10 @@ build system." HOMEPAGE="https://mesonbuild.com/" COPYRIGHT="2013-2018 The Meson development team" LICENSE="Apache v2" -REVISION="1" +REVISION="2" SOURCE_URI="https://github.com/mesonbuild/meson/releases/download/$portVersion/meson-$portVersion.tar.gz" CHECKSUM_SHA256="39ead8bfd0dc9c7b0af15e23ea975c864600bf871fba279c9918625bb9a85506" +PATCHES="meson-$portVersion.patchset" PYTHON_VERSION="3.6" ARCHITECTURES="any" @@ -21,6 +22,7 @@ PROVIDES=" " REQUIRES=" haiku + setuptools_python3 cmd:python$PYTHON_VERSION cmd:ninja >= 1.6 " diff --git a/dev-util/meson/patches/meson-0.48.2.patchset b/dev-util/meson/patches/meson-0.48.2.patchset new file mode 100644 index 000000000..7a552f907 --- /dev/null +++ b/dev-util/meson/patches/meson-0.48.2.patchset @@ -0,0 +1,25 @@ +From 85adb5a1499d8e5e5a1448c2f41834d16ff936a3 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 6c27043..2a33c66 100644 +--- a/mesonbuild/environment.py ++++ b/mesonbuild/environment.py +@@ -206,6 +206,8 @@ def detect_cpu_family(compilers): + trial = platform.machine().lower() + if trial.startswith('i') and trial.endswith('86'): + return 'x86' ++ if trial == 'bepc': ++ return 'x86' + if trial.startswith('arm'): + return 'arm' + if trial.startswith('ppc64'): +-- +2.19.1 +