meson: bump version.

This commit is contained in:
Jerome Duval
2017-05-11 22:59:50 +02:00
parent 9c9cdd0e65
commit f09ca73749
2 changed files with 11 additions and 11 deletions

View File

@@ -6,7 +6,7 @@ COPYRIGHT="2013-2017 The Meson development team"
LICENSE="Apache v2"
REVISION="1"
SOURCE_URI="https://github.com/mesonbuild/meson/releases/download/$portVersion/meson-$portVersion.tar.gz"
CHECKSUM_SHA256="44885ccfef94d3d4afb1053fa6673ed130d3093fc9e9f6624d08161d8a385220"
CHECKSUM_SHA256="890ce46e713ea0d061f8203c99fa7d38645354a62e4c207c38ade18db852cbf5"
PATCHES="meson-$portVersion.patchset"
PYTHON_VERSION="3.6"

View File

@@ -1,14 +1,14 @@
From c7e486aceb016655a66c259eff1d41cc9bd73b37 Mon Sep 17 00:00:00 2001
From 88b4446f1a7b13dd3c40924b1e172e56e18f8f51 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sun, 16 Apr 2017 13:57:03 +0200
Subject: Haiku patch
diff --git a/mesonbuild/mesonlib.py b/mesonbuild/mesonlib.py
index c7368d5..c8dbc2b 100644
index 0263768..f67ae52 100644
--- a/mesonbuild/mesonlib.py
+++ b/mesonbuild/mesonlib.py
@@ -206,6 +206,9 @@ def is_osx():
@@ -218,6 +218,9 @@ def is_osx():
def is_linux():
return platform.system().lower() == 'linux'
@@ -19,18 +19,18 @@ index c7368d5..c8dbc2b 100644
platname = platform.system().lower()
return platname == 'windows' or 'mingw' in platname
diff --git a/run_tests.py b/run_tests.py
index 5025057..bb5eec7 100755
index d0a67e8..5d0f77e 100755
--- a/run_tests.py
+++ b/run_tests.py
@@ -24,7 +24,7 @@ from mesonbuild import mesonlib
if __name__ == '__main__':
returncode = 0
@@ -125,7 +125,7 @@ if __name__ == '__main__':
backend = Backend.xcode
break
# Running on a developer machine? Be nice!
- if not mesonlib.is_windows() and 'TRAVIS' not in os.environ:
+ if not mesonlib.is_windows() and not mesonlib.is_haiku() and 'TRAVIS' not in os.environ:
os.nice(20)
print('Running unittests.\n')
units = ['InternalTests', 'AllPlatformTests']
# Appveyor sets the `platform` environment variable which completely messes
# up building with the vs2010 and vs2015 backends.
--
2.11.0
2.12.2