Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-auth/elogind/, sys-auth/elogind/files/
Date: Sun, 07 Oct 2018 12:48:39
Message-Id: 1538916298.5acd1190fb098a9e938cc8daf3c55d31083e4dbb.asturm@gentoo
1 commit: 5acd1190fb098a9e938cc8daf3c55d31083e4dbb
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sun Oct 7 12:44:36 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sun Oct 7 12:44:58 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5acd1190
7
8 sys-auth/elogind: Fix build with >=meson-0.48
9
10 Thanks-to: Boris Vingradov <no111u3 <AT> gmail.com>
11 Closes: https://bugs.gentoo.org/667948
12 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
13 Package-Manager: Portage-2.3.50, Repoman-2.3.11
14
15 sys-auth/elogind/elogind-238.1.ebuild | 7 +++-
16 .../elogind/files/elogind-238.1-meson-0.48.patch | 46 ++++++++++++++++++++++
17 2 files changed, 51 insertions(+), 2 deletions(-)
18
19 diff --git a/sys-auth/elogind/elogind-238.1.ebuild b/sys-auth/elogind/elogind-238.1.ebuild
20 index cc148ee6f8d..176b4b39bba 100644
21 --- a/sys-auth/elogind/elogind-238.1.ebuild
22 +++ b/sys-auth/elogind/elogind-238.1.ebuild
23 @@ -1,4 +1,4 @@
24 -# Copyright 1999-2018 Gentoo Foundation
25 +# Copyright 1999-2018 Gentoo Authors
26 # Distributed under the terms of the GNU General Public License v2
27
28 EAPI=6
29 @@ -41,7 +41,10 @@ PDEPEND="
30
31 DOCS=( src/libelogind/sd-bus/GVARIANT-SERIALIZATION )
32
33 -PATCHES=( "${FILESDIR}/${P}-docs.patch" )
34 +PATCHES=(
35 + "${FILESDIR}/${P}-docs.patch"
36 + "${FILESDIR}/${P}-meson-0.48.patch"
37 +)
38
39 pkg_setup() {
40 local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SIGNALFD ~TIMERFD"
41
42 diff --git a/sys-auth/elogind/files/elogind-238.1-meson-0.48.patch b/sys-auth/elogind/files/elogind-238.1-meson-0.48.patch
43 new file mode 100644
44 index 00000000000..ea4ce0f8f93
45 --- /dev/null
46 +++ b/sys-auth/elogind/files/elogind-238.1-meson-0.48.patch
47 @@ -0,0 +1,46 @@
48 +From 63c4b947c4fddbefd8d35acf6dffdaf34d6077ee Mon Sep 17 00:00:00 2001
49 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@××××××.pl>
50 +Date: Sun, 19 Aug 2018 19:11:30 +0200
51 +Subject: [PATCH] meson: rename -Ddebug to -Ddebug-extra
52 +
53 +Meson added -Doptimization and -Ddebug options, which obviously causes
54 +a conflict with our -Ddebug options. Let's rename it.
55 +
56 +Fixes #76.
57 +---
58 + meson.build | 2 +-
59 + meson_options.txt | 4 ++--
60 + 2 files changed, 3 insertions(+), 3 deletions(-)
61 +
62 +diff --git a/meson.build b/meson.build
63 +index 05a257d1f..117af9e5e 100644
64 +--- a/meson.build
65 ++++ b/meson.build
66 +@@ -936,7 +936,7 @@ conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
67 + # substs.set('DEBUGTTY', get_option('debug-tty'))
68 + #endif // 0
69 +
70 +-debug = get_option('debug')
71 ++debug = get_option('debug-extra')
72 + enable_debug_hashmap = false
73 + enable_debug_mmap_cache = false
74 + #if 1 /// additional elogind debug mode
75 +diff --git a/meson_options.txt b/meson_options.txt
76 +index 84100b629..f12b542e5 100644
77 +--- a/meson_options.txt
78 ++++ b/meson_options.txt
79 +@@ -77,12 +77,12 @@ option('kexec-path', type : 'string', description : 'path to kexec')
80 + # description : 'path to debug shell binary')
81 + # option('debug-tty', type : 'string', value : '/dev/tty9',
82 + # description : 'specify the tty device for debug shell')
83 +-# option('debug', type : 'string',
84 ++# option('debug-extra', type : 'string',
85 + # description : 'enable extra debugging (hashmap,mmap-cache)')
86 + # option('memory-accounting-default', type : 'boolean',
87 + # description : 'enable MemoryAccounting= by default')
88 + #else
89 +-option('debug', type : 'string',
90 ++option('debug-extra', type : 'string',
91 + description : 'enable extra debugging (elogind,hashmap,mmap-cache)')
92 + #endif // 0
93 +
94 \ No newline at end of file