/[packages]/cauldron/systemd/current/SOURCES/0510-Fix-build-with-new-meson.patch
ViewVC logotype

Contents of /cauldron/systemd/current/SOURCES/0510-Fix-build-with-new-meson.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1353672 - (show annotations) (download)
Wed Jan 9 16:53:07 2019 UTC (5 years, 3 months ago) by wally
File size: 1312 byte(s)
- backport upstream patch to fix build with new meson
1 From 67145d46bdcd063519193716058ac40792658687 Mon Sep 17 00:00:00 2001
2 From: =?UTF-8?q?Jani=20V=C3=A4limaa?= <wally@mageia.org>
3 Date: Wed, 9 Jan 2019 18:49:35 +0200
4 Subject: [PATCH] Fix build with new meson
5
6 ---
7 meson.build | 2 +-
8 meson_options.txt | 2 +-
9 2 files changed, 2 insertions(+), 2 deletions(-)
10
11 diff --git a/meson.build b/meson.build
12 index 644407e..c3ca02e 100644
13 --- a/meson.build
14 +++ b/meson.build
15 @@ -728,7 +728,7 @@ conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
16 substs.set('SUSHELL', get_option('debug-shell'))
17 substs.set('DEBUGTTY', get_option('debug-tty'))
18
19 -debug = get_option('debug')
20 +debug = get_option('debug-extra')
21 enable_debug_hashmap = false
22 enable_debug_mmap_cache = false
23 if debug != ''
24 diff --git a/meson_options.txt b/meson_options.txt
25 index f0c0506..4e6e261 100644
26 --- a/meson_options.txt
27 +++ b/meson_options.txt
28 @@ -50,7 +50,7 @@ option('debug-shell', type : 'string', value : '/bin/sh',
29 description : 'path to debug shell binary')
30 option('debug-tty', type : 'string', value : '/dev/tty9',
31 description : 'specify the tty device for debug shell')
32 -option('debug', type : 'string',
33 +option('debug-extra', type : 'string',
34 description : 'enable extra debugging (hashmap,mmap-cache)')
35
36 option('utmp', type : 'boolean',
37 --
38 2.20.1
39

  ViewVC Help
Powered by ViewVC 1.1.30