[Buildroot] [PATCH 1/1] package/systemd: backport meson cpp fix

james.hilliard1 at gmail.com james.hilliard1 at gmail.com
Sat Dec 29 11:49:12 UTC 2018


From: James Hilliard <james.hilliard1 at gmail.com>

This is needed so that systemd can be built without a cpp toolchain.

Signed-off-by: James Hilliard <james.hilliard1 at gmail.com>
---
 ...-use-cross-compilation-compatible-c-check.patch | 40 ++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 package/systemd/0003-meson-use-cross-compilation-compatible-c-check.patch

diff --git a/package/systemd/0003-meson-use-cross-compilation-compatible-c-check.patch b/package/systemd/0003-meson-use-cross-compilation-compatible-c-check.patch
new file mode 100644
index 0000000..f6eea34
--- /dev/null
+++ b/package/systemd/0003-meson-use-cross-compilation-compatible-c-check.patch
@@ -0,0 +1,40 @@
+From de8eab973f4d4b0f1f1eb8169165be524aefa306 Mon Sep 17 00:00:00 2001
+From: James Hilliard <james.hilliard1 at gmail.com>
+Date: Thu, 27 Dec 2018 09:16:20 +0800
+Subject: [PATCH 1/1] meson: use cross compilation compatible c++ check
+
+Signed-off-by: James Hilliard <james.hilliard1 at gmail.com>
+---
+ meson.build             | 1 -
+ src/systemd/meson.build | 3 +--
+ 2 files changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 337e014..4f1b3f9 100644
+--- a/meson.build
++++ b/meson.build
+@@ -289,7 +289,6 @@ install_tests = get_option('install-tests')
+ 
+ if add_languages('cpp', required : fuzzer_build)
+         #  Used only for tests
+-        add_languages('cpp')
+         cxx_cmd = ' '.join(meson.get_compiler('cpp').cmd_array())
+ else
+         cxx_cmd = ''
+diff --git a/src/systemd/meson.build b/src/systemd/meson.build
+index e0c967e..75c48b0 100644
+--- a/src/systemd/meson.build
++++ b/src/systemd/meson.build
+@@ -52,8 +52,7 @@ if cc.has_argument('-std=iso9899:2017')
+         opts += [['c', '-std=iso9899:2017']]
+ endif
+ 
+-cxx = find_program('c++', required : false)
+-if cxx.found()
++if add_languages('cpp', required : false)
+         opts += [['c++'],
+                  ['c++', '-std=c++98'],
+                  ['c++', '-std=c++11']]
+-- 
+2.7.4
+
-- 
2.7.4



More information about the buildroot mailing list