summaryrefslogtreecommitdiff
path: root/sys-fs
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2018-09-29 11:26:33 -0400
committerMike Gilbert <floppym@gentoo.org>2018-09-29 11:26:57 -0400
commitabebe048fd7040d7f5ee143e3385953858011717 (patch)
treedacde3a3a16ad4e09adead70ab362ede2f7fdd9c /sys-fs
parentsys-apps/systemd: rename debug meson option (diff)
downloadgentoo-abebe048fd7040d7f5ee143e3385953858011717.tar.gz
gentoo-abebe048fd7040d7f5ee143e3385953858011717.tar.bz2
gentoo-abebe048fd7040d7f5ee143e3385953858011717.zip
sys-fs/udev: rename meson debug option
Closes: https://bugs.gentoo.org/667240 Signed-off-by: Mike Gilbert <floppym@gentoo.org> Package-Manager: Portage-2.3.50_p2, Repoman-2.3.11_p9
Diffstat (limited to 'sys-fs')
-rw-r--r--sys-fs/udev/files/239-debug-extra.patch40
-rw-r--r--sys-fs/udev/udev-239.ebuild3
2 files changed, 42 insertions, 1 deletions
diff --git a/sys-fs/udev/files/239-debug-extra.patch b/sys-fs/udev/files/239-debug-extra.patch
new file mode 100644
index 00000000000..19db590257c
--- /dev/null
+++ b/sys-fs/udev/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?= <zbyszek@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-fs/udev/udev-239.ebuild b/sys-fs/udev/udev-239.ebuild
index b09e0c65e66..b6ffc09d185 100644
--- a/sys-fs/udev/udev-239.ebuild
+++ b/sys-fs/udev/udev-239.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
@@ -83,6 +83,7 @@ src_prepare() {
local PATCHES=(
"${FILESDIR}/236-uucp-group.patch"
"${FILESDIR}/239-basic-add-missing-comma-in-raw_clone-assembly-for-sp.patch"
+ "${FILESDIR}/239-debug-extra.patch"
)
default