From: Thomas Devoogdt <thomas@devoogdt.com>
To: buildroot@buildroot.org
Cc: eric.le.bihan.dev@free.fr, thomas@devoogdt.com,
yann.morin.1998@free.fr,
Thomas Devoogdt <thomas.devoogdt@barco.com>,
thomas.petazzoni@bootlin.com, aperez@igalia.com,
fontaine.fabrice@gmail.com
Subject: [Buildroot] [PATCH v1] package/cairo: fix compilation on toolchains without c++ support
Date: Thu, 18 Jul 2024 12:19:55 +0000 [thread overview]
Message-ID: <20240718121955.10918-1-thomas@devoogdt.com> (raw)
From: Thomas Devoogdt <thomas.devoogdt@barco.com>
Fixes:
- https://lore.kernel.org/buildroot/20240717200926.1a7db2a1@windsurf/
Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
---
...3-meson-only-require-cpp-for-windows.patch | 38 +++++++++++++++++++
1 file changed, 38 insertions(+)
create mode 100644 package/cairo/0003-meson-only-require-cpp-for-windows.patch
diff --git a/package/cairo/0003-meson-only-require-cpp-for-windows.patch b/package/cairo/0003-meson-only-require-cpp-for-windows.patch
new file mode 100644
index 0000000000..9774f29f8c
--- /dev/null
+++ b/package/cairo/0003-meson-only-require-cpp-for-windows.patch
@@ -0,0 +1,38 @@
+From e93ef3feb69994e3aa4e0ab66ccd66139b097e49 Mon Sep 17 00:00:00 2001
+From: Thomas Devoogdt <thomas.devoogdt@barco.com>
+Date: Thu, 18 Jul 2024 12:16:51 +0200
+Subject: [PATCH] meson: only require cpp for windows
+
+Allow to compile meson without c++ toolchain.
+
+Fixes:
+ - https://lore.kernel.org/buildroot/20240717200926.1a7db2a1@windsurf/
+
+Upstream: https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/573
+Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
+---
+ meson.build | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index 9100152ee..297482b03 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1,4 +1,4 @@
+-project('cairo', 'c', 'cpp',
++project('cairo', 'c',
+ meson_version: '>= 0.59.0',
+ version: run_command(find_program('version.py'), check: true).stdout().strip(),
+ default_options: ['warning_level=2'],
+@@ -489,6 +489,8 @@ if host_machine.system() == 'darwin' and not get_option('quartz').disabled()
+ endif
+
+ if host_machine.system() == 'windows'
++ add_languages('cpp')
++
+ add_project_arguments('-DWIN32_LEAN_AND_MEAN', '-DNOMINMAX', language: ['c', 'cpp'])
+
+ win32_extra_deps = [
+--
+2.45.2
+
--
2.45.2
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
next reply other threads:[~2024-07-18 12:20 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-18 12:19 Thomas Devoogdt [this message]
2024-07-18 19:59 ` [Buildroot] [PATCH v1] package/cairo: fix compilation on toolchains without c++ support Thomas Petazzoni via buildroot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240718121955.10918-1-thomas@devoogdt.com \
--to=thomas@devoogdt.com \
--cc=aperez@igalia.com \
--cc=buildroot@buildroot.org \
--cc=eric.le.bihan.dev@free.fr \
--cc=fontaine.fabrice@gmail.com \
--cc=thomas.devoogdt@barco.com \
--cc=thomas.petazzoni@bootlin.com \
--cc=yann.morin.1998@free.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox