mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
systemd: fix meson 0.49.1 compatability
https://github.com/systemd/systemd/pull/9885 Drop patch with systemd-241
This commit is contained in:
parent
4f3bc3eb19
commit
ad6c9ea874
40
packages/sysutils/systemd/patches/systemd-0300-PR9885.patch
Normal file
40
packages/sysutils/systemd/patches/systemd-0300-PR9885.patch
Normal file
@ -0,0 +1,40 @@
|
|||||||
|
From 1c04c791e85f9dd5e16ae846d0c0b0a99a47076e 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')
|
Loading…
x
Reference in New Issue
Block a user