1 |
commit: e8192a2eff5472db971b1be47db26ef70bbad226 |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Sep 29 15:23:46 2018 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Sep 29 15:26:57 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8192a2e |
7 |
|
8 |
sys-apps/systemd: rename debug meson option |
9 |
|
10 |
Closes: https://bugs.gentoo.org/667300 |
11 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
12 |
Package-Manager: Portage-2.3.50_p2, Repoman-2.3.11_p9 |
13 |
|
14 |
sys-apps/systemd/files/239-debug-extra.patch | 40 ++++++++++++++++++++++++++++ |
15 |
sys-apps/systemd/systemd-239-r1.ebuild | 3 ++- |
16 |
2 files changed, 42 insertions(+), 1 deletion(-) |
17 |
|
18 |
diff --git a/sys-apps/systemd/files/239-debug-extra.patch b/sys-apps/systemd/files/239-debug-extra.patch |
19 |
new file mode 100644 |
20 |
index 00000000000..19db590257c |
21 |
--- /dev/null |
22 |
+++ b/sys-apps/systemd/files/239-debug-extra.patch |
23 |
@@ -0,0 +1,40 @@ |
24 |
+From 8f6b442a78d0b485f044742ad90b2e8271b4e68e Mon Sep 17 00:00:00 2001 |
25 |
+From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@××××××.pl> |
26 |
+Date: Sun, 19 Aug 2018 19:11:30 +0200 |
27 |
+Subject: [PATCH] meson: rename -Ddebug to -Ddebug-extra |
28 |
+ |
29 |
+Meson added -Doptimization and -Ddebug options, which obviously causes |
30 |
+a conflict with our -Ddebug options. Let's rename it. |
31 |
+ |
32 |
+Fixes #9883. |
33 |
+--- |
34 |
+ meson.build | 2 +- |
35 |
+ meson_options.txt | 2 +- |
36 |
+ 2 files changed, 2 insertions(+), 2 deletions(-) |
37 |
+ |
38 |
+diff --git a/meson.build b/meson.build |
39 |
+index f79ac4b12e7..2209c935ad6 100644 |
40 |
+--- a/meson.build |
41 |
++++ b/meson.build |
42 |
+@@ -763,7 +763,7 @@ substs.set('DEBUGTTY', get_option('debug-tty')) |
43 |
+ |
44 |
+ enable_debug_hashmap = false |
45 |
+ enable_debug_mmap_cache = false |
46 |
+-foreach name : get_option('debug') |
47 |
++foreach name : get_option('debug-extra') |
48 |
+ if name == 'hashmap' |
49 |
+ enable_debug_hashmap = true |
50 |
+ elif name == 'mmap-cache' |
51 |
+diff --git a/meson_options.txt b/meson_options.txt |
52 |
+index e3140c8c110..7b1f61bf464 100644 |
53 |
+--- a/meson_options.txt |
54 |
++++ b/meson_options.txt |
55 |
+@@ -45,7 +45,7 @@ option('debug-shell', type : 'string', value : '/bin/sh', |
56 |
+ description : 'path to debug shell binary') |
57 |
+ option('debug-tty', type : 'string', value : '/dev/tty9', |
58 |
+ description : 'specify the tty device for debug shell') |
59 |
+-option('debug', type : 'array', choices : ['hashmap', 'mmap-cache'], value : [], |
60 |
++option('debug-extra', type : 'array', choices : ['hashmap', 'mmap-cache'], value : [], |
61 |
+ description : 'enable extra debugging') |
62 |
+ option('memory-accounting-default', type : 'boolean', |
63 |
+ description : 'enable MemoryAccounting= by default') |
64 |
|
65 |
diff --git a/sys-apps/systemd/systemd-239-r1.ebuild b/sys-apps/systemd/systemd-239-r1.ebuild |
66 |
index 1fc28a80c2a..69bfa21435e 100644 |
67 |
--- a/sys-apps/systemd/systemd-239-r1.ebuild |
68 |
+++ b/sys-apps/systemd/systemd-239-r1.ebuild |
69 |
@@ -1,4 +1,4 @@ |
70 |
-# Copyright 1999-2018 Gentoo Foundation |
71 |
+# Copyright 1999-2018 Gentoo Authors |
72 |
# Distributed under the terms of the GNU General Public License v2 |
73 |
|
74 |
EAPI=6 |
75 |
@@ -154,6 +154,7 @@ src_prepare() { |
76 |
|
77 |
# Add local patches here |
78 |
PATCHES+=( |
79 |
+ "${FILESDIR}"/239-debug-extra.patch |
80 |
) |
81 |
|
82 |
if ! use vanilla; then |