gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

sys-auth/elogind: Fix build with >=meson-0.48

Browse Source 
Thanks-to: Boris Vingradov <no111u3@gmail.com>
Closes: https://bugs.gentoo.org/667948
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
This commit is contained in:
Andreas Sturmlechner
2018-10-07 14:44:36 +02:00
parent 17d4977d0a
commit 5acd1190fb
2 changed files with 51 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sys-auth/elogind/elogind-238.1.ebuild
View File

@@ -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
@@ -41,7 +41,10 @@ PDEPEND="
DOCS=( src/libelogind/sd-bus/GVARIANT-SERIALIZATION )
PATCHES=( "${FILESDIR}/${P}-docs.patch" )
PATCHES=(
"${FILESDIR}/${P}-docs.patch"
"${FILESDIR}/${P}-meson-0.48.patch"
)
pkg_setup() {
local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SIGNALFD ~TIMERFD"

46
sys-auth/elogind/files/elogind-238.1-meson-0.48.patch Normal file
View File

@@ -0,0 +1,46 @@
From 63c4b947c4fddbefd8d35acf6dffdaf34d6077ee 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 #76.
---
meson.build | 2 +-
meson_options.txt | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meson.build b/meson.build
index 05a257d1f..117af9e5e 100644
--- a/meson.build
+++ b/meson.build
@@ -936,7 +936,7 @@ conf.set_quoted('GETTEXT_PACKAGE', meson.project_name())
# substs.set('DEBUGTTY', get_option('debug-tty'))
#endif // 0
-debug = get_option('debug')
+debug = get_option('debug-extra')
enable_debug_hashmap = false
enable_debug_mmap_cache = false
#if 1 /// additional elogind debug mode
diff --git a/meson_options.txt b/meson_options.txt
index 84100b629..f12b542e5 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -77,12 +77,12 @@ option('kexec-path', type : 'string', description : 'path to kexec')
# 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 : 'string',
+# option('debug-extra', type : 'string',
# description : 'enable extra debugging (hashmap,mmap-cache)')
# option('memory-accounting-default', type : 'boolean',
# description : 'enable MemoryAccounting= by default')
#else
-option('debug', type : 'string',
+option('debug-extra', type : 'string',
description : 'enable extra debugging (elogind,hashmap,mmap-cache)')
#endif // 0