From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 9 Mar 2018 13:21:08 +0000 (+0100)
Subject: meson: avoid warning about comparison of bool and string
X-Git-Tag: v239~560^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=af4d7860c4e757f34a02ca73a0b14c73c18f8b30;p=thirdparty%2Fsystemd.git

meson: avoid warning about comparison of bool and string

meson.build:2907: WARNING: Trying to compare values of different types (bool, str) using ==.
The result of this is undefined and will become a hard error in a future Meson release.
---

diff --git a/meson.build b/meson.build
index 30b7f1bafaf..e152226eadb 100644
--- a/meson.build
+++ b/meson.build
@@ -2903,8 +2903,9 @@ foreach tuple : [
         ['debug mmap cache'],
 ]
 
-        cond = tuple.get(1, '')
-        if cond == ''
+        if tuple.length() >= 2
+                cond = tuple[1]
+        else
                 ident1 = 'HAVE_' + tuple[0].underscorify().to_upper()
                 ident2 = 'ENABLE_' + tuple[0].underscorify().to_upper()
                 cond = conf.get(ident1, 0) == 1 or conf.get(ident2, 0) == 1