diff mbox series

[1/1] package/wayland: fix build with toolchains without c++

Message ID 20200729181650.6949-1-bernd.kuhls@t-online.de
State Accepted
Headers show
Series [1/1] package/wayland: fix build with toolchains without c++ | expand

Commit Message

Bernd Kuhls July 29, 2020, 6:16 p.m. UTC
Fixes
http://autobuild.buildroot.net/results/fb2/fb205601cac2bbf8e70ec2bf4eaf22264d8edc96/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 .../0002-meson-do-not-check-for-c.patch       | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 package/wayland/0002-meson-do-not-check-for-c.patch

Comments

Peter Korsgaard Aug. 3, 2020, 9:05 p.m. UTC | #1
>>>>> "Bernd" == Bernd Kuhls <bernd.kuhls@t-online.de> writes:

 > Fixes
 > http://autobuild.buildroot.net/results/fb2/fb205601cac2bbf8e70ec2bf4eaf22264d8edc96/

 > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

I see that this breaks the tests, so the final solution will presumably
look differently.

With that said, we need a fix - So I've applied it for now, thanks.
diff mbox series

Patch

diff --git a/package/wayland/0002-meson-do-not-check-for-c.patch b/package/wayland/0002-meson-do-not-check-for-c.patch
new file mode 100644
index 0000000000..c5819bf477
--- /dev/null
+++ b/package/wayland/0002-meson-do-not-check-for-c.patch
@@ -0,0 +1,29 @@ 
+From 1df9b73db6541cbc483c6ee1b21dbe0cb6e5cbfa Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Wed, 29 Jul 2020 08:20:41 +0200
+Subject: [PATCH] meson: do not check for c++
+
+Wayland does not need c++, fixes building with toolchains lacking c++.
+
+Backported from upstream PR:
+https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/88
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index b67b101..e47a52d 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1,5 +1,5 @@
+ project(
+-	'wayland', 'c', 'cpp',
++	'wayland', 'c',
+ 	version: '1.18.0',
+ 	license: 'MIT',
+ 	meson_version: '>= 0.47.0',
+-- 
+2.27.0
+