commit: e8192a2eff5472db971b1be47db26ef70bbad226 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Sat Sep 29 15:23:46 2018 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sat Sep 29 15:26:57 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8192a2e
sys-apps/systemd: rename debug meson option Closes: https://bugs.gentoo.org/667300 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> Package-Manager: Portage-2.3.50_p2, Repoman-2.3.11_p9 sys-apps/systemd/files/239-debug-extra.patch | 40 ++++++++++++++++++++++++++++ sys-apps/systemd/systemd-239-r1.ebuild | 3 ++- 2 files changed, 42 insertions(+), 1 deletion(-) diff --git a/sys-apps/systemd/files/239-debug-extra.patch b/sys-apps/systemd/files/239-debug-extra.patch new file mode 100644 index 00000000000..19db590257c --- /dev/null +++ b/sys-apps/systemd/files/239-debug-extra.patch @@ -0,0 +1,40 @@ +From 8f6b442a78d0b485f044742ad90b2e8271b4e68e Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbys...@in.waw.pl> +Date: Sun, 19 Aug 2018 19:11:30 +0200 +Subject: [PATCH] meson: rename -Ddebug to -Ddebug-extra + +Meson added -Doptimization and -Ddebug options, which obviously causes +a conflict with our -Ddebug options. Let's rename it. + +Fixes #9883. +--- + meson.build | 2 +- + meson_options.txt | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index f79ac4b12e7..2209c935ad6 100644 +--- a/meson.build ++++ b/meson.build +@@ -763,7 +763,7 @@ substs.set('DEBUGTTY', get_option('debug-tty')) + + enable_debug_hashmap = false + enable_debug_mmap_cache = false +-foreach name : get_option('debug') ++foreach name : get_option('debug-extra') + if name == 'hashmap' + enable_debug_hashmap = true + elif name == 'mmap-cache' +diff --git a/meson_options.txt b/meson_options.txt +index e3140c8c110..7b1f61bf464 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -45,7 +45,7 @@ option('debug-shell', type : 'string', value : '/bin/sh', + description : 'path to debug shell binary') + option('debug-tty', type : 'string', value : '/dev/tty9', + description : 'specify the tty device for debug shell') +-option('debug', type : 'array', choices : ['hashmap', 'mmap-cache'], value : [], ++option('debug-extra', type : 'array', choices : ['hashmap', 'mmap-cache'], value : [], + description : 'enable extra debugging') + option('memory-accounting-default', type : 'boolean', + description : 'enable MemoryAccounting= by default') diff --git a/sys-apps/systemd/systemd-239-r1.ebuild b/sys-apps/systemd/systemd-239-r1.ebuild index 1fc28a80c2a..69bfa21435e 100644 --- a/sys-apps/systemd/systemd-239-r1.ebuild +++ b/sys-apps/systemd/systemd-239-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -154,6 +154,7 @@ src_prepare() { # Add local patches here PATCHES+=( + "${FILESDIR}"/239-debug-extra.patch ) if ! use vanilla; then
