| 1 |
commit: 1a94fdfff13237475b08c75461ea5b2c55a8796d |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Oct 2 15:41:11 2018 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Oct 2 15:41:11 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a94fdff |
| 7 |
|
| 8 |
sys-boot/systemd-boot: rename debug meson option |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/667582 |
| 11 |
Package-Manager: Portage-2.3.50_p10, Repoman-2.3.11_p17 |
| 12 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 13 |
|
| 14 |
sys-boot/systemd-boot/files/239-debug-extra.patch | 40 +++++++++++++++++++++++ |
| 15 |
sys-boot/systemd-boot/systemd-boot-239.ebuild | 3 +- |
| 16 |
2 files changed, 42 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/sys-boot/systemd-boot/files/239-debug-extra.patch b/sys-boot/systemd-boot/files/239-debug-extra.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..19db590257c |
| 21 |
--- /dev/null |
| 22 |
+++ b/sys-boot/systemd-boot/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-boot/systemd-boot/systemd-boot-239.ebuild b/sys-boot/systemd-boot/systemd-boot-239.ebuild |
| 66 |
index 48d61ac38b2..4eb8570b73c 100644 |
| 67 |
--- a/sys-boot/systemd-boot/systemd-boot-239.ebuild |
| 68 |
+++ b/sys-boot/systemd-boot/systemd-boot-239.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 |
@@ -37,6 +37,7 @@ S="${WORKDIR}/systemd-${PV}" |
| 76 |
|
| 77 |
PATCHES=( |
| 78 |
"${FILESDIR}/237-libshared-static.patch" |
| 79 |
+ "${FILESDIR}/239-debug-extra.patch" |
| 80 |
) |
| 81 |
|
| 82 |
src_configure() { |
Archives