meson: update to 0.50.0

Required by MPD.
This commit is contained in:
François Revol
2019-03-26 20:06:17 +01:00
parent 01c534c017
commit f2b2398208
2 changed files with 12 additions and 12 deletions

View File

@@ -2,11 +2,11 @@ SUMMARY="A High productivity build system"
DESCRIPTION="Meson® is a project to create the best possible next-generation \
build system."
HOMEPAGE="https://mesonbuild.com/"
COPYRIGHT="2013-2018 The Meson development team"
COPYRIGHT="2013-2019 The Meson development team"
LICENSE="Apache v2"
REVISION="2"
SOURCE_URI="https://github.com/mesonbuild/meson/releases/download/$portVersion/meson-$portVersion.tar.gz"
CHECKSUM_SHA256="39ead8bfd0dc9c7b0af15e23ea975c864600bf871fba279c9918625bb9a85506"
CHECKSUM_SHA256="2a1bc42dda58206fb922cda5e1ca95cc03ad126321d26acc47d3493ec4e7021f"
PATCHES="meson-$portVersion.patchset"
PYTHON_VERSION="3.6"

View File

@@ -1,4 +1,4 @@
From 85adb5a1499d8e5e5a1448c2f41834d16ff936a3 Mon Sep 17 00:00:00 2001
From 9737a81fbcd3ff9471868393735c703335bb9963 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Tue, 12 Mar 2019 03:39:42 +0100
Subject: [PATCH] Properly detect 'bepc' as 'x86' CPU for Haiku
@@ -8,18 +8,18 @@ Subject: [PATCH] Properly detect 'bepc' as 'x86' CPU for Haiku
1 file changed, 2 insertions(+)
diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py
index 6c27043..2a33c66 100644
index 08324632..74ce058c 100644
--- a/mesonbuild/environment.py
+++ b/mesonbuild/environment.py
@@ -206,6 +206,8 @@ def detect_cpu_family(compilers):
@@ -204,6 +204,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'):
trial = 'x86'
+ elif trial == 'bepc':
+ trial = 'x86'
elif trial.startswith('arm'):
trial = 'arm'
elif trial.startswith('ppc64'):
--
2.19.1
2.20.1