[ptxdist] [PATCH] systemd: fix build with meson 0.49.2

[ptxdist] [PATCH] systemd: fix build with meson 0.49.2

[Philipp Zabel]

Add upstream patch to rename the 'debug' option to 'debug-extra'.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
---
 ...-meson-rename-Ddebug-to-Ddebug-extra.patch | 39 +++++++++++++++++++
 patches/systemd-239/series                    |  3 +-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 patches/systemd-239/0003-meson-rename-Ddebug-to-Ddebug-extra.patch

diff --git a/patches/systemd-239/0003-meson-rename-Ddebug-to-Ddebug-extra.patch b/patches/systemd-239/0003-meson-rename-Ddebug-to-Ddebug-extra.patch
new file mode 100644
index 000000000000..e2220c5db792
--- /dev/null
+++ b/patches/systemd-239/0003-meson-rename-Ddebug-to-Ddebug-extra.patch
@@ -0,0 +1,39 @@
+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 a0e724070874..7032ebd761c1 100644
+--- a/meson.build
++++ b/meson.build
+@@ -769,7 +769,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 16c1f2b2fa27..dc7951b99177 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -46,7 +46,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/patches/systemd-239/series b/patches/systemd-239/series
index bdfa3c1e8c61..dbdbc895e4a3 100644
--- a/patches/systemd-239/series
+++ b/patches/systemd-239/series
@@ -2,4 +2,5 @@
 #tag:base --start-number 1
 0001-build-sys-Detect-whether-struct-statx-is-defined-in-.patch
 0002-dhcp6-make-sure-we-have-enough-space-for-the-DHCP6-o.patch
-# 69d3a3089d693a020a7338b3e119044a  - git-ptx-patches magic
+0003-meson-rename-Ddebug-to-Ddebug-extra.patch
+# 0e7559d1e8d4c74f5599cdf1d8fb8158  - git-ptx-patches magic
-- 
2.20.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de