Blame SOURCES/0157-meson-drop-duplicated-condition.patch
|
 |
ff6046 |
From fff862ce6f33acb6ce8dc422e0f53ec681ebed6d Mon Sep 17 00:00:00 2001
|
|
|
ff6046 |
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
|
ff6046 |
Date: Tue, 7 Aug 2018 18:10:53 +0200
|
|
|
ff6046 |
Subject: [PATCH] meson: drop duplicated condition
|
|
|
ff6046 |
|
|
|
ff6046 |
The generic check suffices for those four.
|
|
|
ff6046 |
|
|
|
ff6046 |
(cherry picked from commit 6bd2bc8e16a6d515f8a21c47fd6b833d7fcfdd1c)
|
|
|
ff6046 |
|
|
|
ff6046 |
Resolves: #1696224
|
|
|
ff6046 |
---
|
|
|
ff6046 |
meson.build | 8 ++++----
|
|
|
ff6046 |
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
ff6046 |
|
|
|
ff6046 |
diff --git a/meson.build b/meson.build
|
|
|
ff6046 |
index 863e8eb399..f623bcf37d 100644
|
|
|
ff6046 |
--- a/meson.build
|
|
|
ff6046 |
+++ b/meson.build
|
|
|
ff6046 |
@@ -3003,10 +3003,10 @@ foreach tuple : [
|
|
|
ff6046 |
['blkid'],
|
|
|
ff6046 |
['dbus'],
|
|
|
ff6046 |
['glib'],
|
|
|
ff6046 |
- ['nss-myhostname', conf.get('ENABLE_NSS_MYHOSTNAME') == 1],
|
|
|
ff6046 |
- ['nss-mymachines', conf.get('ENABLE_NSS_MYMACHINES') == 1],
|
|
|
ff6046 |
- ['nss-resolve', conf.get('ENABLE_NSS_RESOLVE') == 1],
|
|
|
ff6046 |
- ['nss-systemd', conf.get('ENABLE_NSS_SYSTEMD') == 1],
|
|
|
ff6046 |
+ ['nss-myhostname'],
|
|
|
ff6046 |
+ ['nss-mymachines'],
|
|
|
ff6046 |
+ ['nss-resolve'],
|
|
|
ff6046 |
+ ['nss-systemd'],
|
|
|
ff6046 |
['hwdb'],
|
|
|
ff6046 |
['tpm'],
|
|
|
ff6046 |
['man pages', want_man],
|