From 3824c8e7cda97c3bf856983ea5fb6d696c75fb24 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Tue, 17 Jul 2018 15:12:32 +0100 Subject: [PATCH] meson: disable asserts by default on release builds By the time Mesa 18.3 comes out (probably December '18), Meson 0.45 will be 9 months old (March '18), so I think this is reasonable. (btw, the currently-required Meson 0.44.1 was released less than 12 days before 0.45, so we're really not bumping by much.) Currently, the Meson versions in the major distributions are: Arch: ships 0.47.2 CentOS: 7 ships 0.47.1 Debian: stable ships 0.37.1, so it hasn't been usable in a long time. everything more recent ships 0.47.2 Fedora: 28 ships 0.45.1 FreeBSD: ships 0.46.1 (ports) Gentoo: ships 0.46.1 OpenSUSE: 15 ships 0.46 Ubuntu: 18.04 ships 0.45.1 Signed-off-by: Eric Engestrom Reviewed-by: Dylan Baker --- .travis.yml | 5 ++--- meson.build | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 90f9ec4..079f145 100644 --- a/.travis.yml +++ b/.travis.yml @@ -490,10 +490,9 @@ before_install: install: # Install a more modern meson from pip, since the version in the - # ubuntu repos is often quite old. Avoid >=0.45.0 as it needs python - # 3.5+ + # ubuntu repos is often quite old. - if test "x$BUILD" = xmeson; then - pip3 install --user "meson<0.45.0"; + pip3 install --user meson; pip3 install --user mako; fi diff --git a/meson.build b/meson.build index 909d46a..0d534b9 100644 --- a/meson.build +++ b/meson.build @@ -25,8 +25,8 @@ project( [find_program('python', 'python2', 'python3'), 'bin/meson_get_version.py'] ).stdout(), license : 'MIT', - meson_version : '>= 0.44.1', - default_options : ['buildtype=debugoptimized', 'c_std=c99', 'cpp_std=c++11'] + meson_version : '>= 0.45', + default_options : ['buildtype=debugoptimized', 'b_ndebug=if-release', 'c_std=c99', 'cpp_std=c++11'] ) cc = meson.get_compiler('c') -- 2.7.4