Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
steam
systemd
Commits
1fee4f18
Commit
1fee4f18
authored
Feb 27, 2019
by
Simon McVittie
Browse files
Fix Meson warnings that might indicate misconfiguration
Signed-off-by:
Simon McVittie
<
smcv@collabora.com
>
parent
6f3d18d3
Changes
3
Hide whitespace changes
Inline
Side-by-side
debian/changelog
View file @
1fee4f18
...
...
@@ -10,6 +10,9 @@ systemd (237-3ubuntu10.13+steamrt2.1) UNRELEASED; urgency=medium
*
d
/
p
/
steamrt
/
journal
-
adapt
-
for
-
new
-
improved
-
LZ4_decompress_safe_partia
.
patch
:
Backport
patch
from
upstream
to
fix
build
-
time
test
failure
with
newer
liblz4
*
d
/
p
/
steamrt
/
meson
-
avoid
-
warning
-
about
-
comparison
-
of
-
bool
-
and
-
string
.
patch
:
Backport
patch
from
upstream
to
fix
Meson
warnings
that
might
indicate
misconfiguration
--
Simon
McVittie
<
smcv
@
collabora
.
com
>
Wed
,
27
Feb
2019
17
:
03
:
51
+
0000
...
...
debian/patches/series
View file @
1fee4f18
...
...
@@ -99,3 +99,4 @@ journal-do-not-remove-multiple-spaces-after-identifi.patch
steamrt/meson-use-array-type-option.patch
steamrt/meson-rename-Ddebug-to-Ddebug-extra.patch
steamrt/journal-adapt-for-new-improved-LZ4_decompress_safe_partia.patch
steamrt/meson-avoid-warning-about-comparison-of-bool-and-string.patch
debian/patches/steamrt/meson-avoid-warning-about-comparison-of-bool-and-string.patch
0 → 100644
View file @
1fee4f18
From: =?utf-8?q?Zbigniew_J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Fri, 9 Mar 2018 14:21:08 +0100
Subject: 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.
Origin: upstream, commit:af4d7860c4e757f34a02ca73a0b14c73c18f8b30
---
meson.build | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
index 81dd902..efc1c6a 100644
--- a/meson.build
+++ b/meson.build
@@ -2854,8 +2854,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
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment