Mesa (main): meson: drop a temp formatting variable

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Sat Dec 18 11:08:37 UTC 2021


Module: Mesa
Branch: main
Commit: 84b21fea46d2b5670b3114cd48a7e859b2e42a35
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=84b21fea46d2b5670b3114cd48a7e859b2e42a35

Author: Thomas H.P. Andersen <phomes at gmail.com>
Date:   Thu Dec 16 23:09:55 2021 +0100

meson: drop a temp formatting variable

This was only needed in meson < 0.50

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14240>

---

 meson.build | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/meson.build b/meson.build
index 0a93ca724ed..f23af107966 100644
--- a/meson.build
+++ b/meson.build
@@ -2158,18 +2158,12 @@ subdir('include')
 subdir('bin')
 subdir('src')
 
-# Meson 0.49 and earlier seems to have a bug that fails to evaluate the string-
-# formatting below unless the first argument is passed as a variable. This has
-# been fixed in Meson 0.50 and beyond, but we need to keep it like this for now
-# for backwards compatibility.
-_with_opengl_string = with_opengl ? 'yes' : 'no'
-
 lines = ['',
   'prefix:          ' + get_option('prefix'),
   'libdir:          ' + get_option('libdir'),
   'includedir:      ' + get_option('includedir'),
   '',
-  'OpenGL:          @0@ (ES1: @1@ ES2: @2@)'.format(_with_opengl_string,
+  'OpenGL:          @0@ (ES1: @1@ ES2: @2@)'.format(with_opengl ? 'yes' : 'no',
                                                     with_gles1 ? 'yes' : 'no',
                                                     with_gles2 ? 'yes' : 'no'),
 ]



More information about the mesa-commit mailing list