2
1

0003-meson-only-require-cpp-for-windows.patch 1.2 KB

1234567891011121314151617181920212223242526272829303132333435363738
  1. From e93ef3feb69994e3aa4e0ab66ccd66139b097e49 Mon Sep 17 00:00:00 2001
  2. From: Thomas Devoogdt <thomas.devoogdt@barco.com>
  3. Date: Thu, 18 Jul 2024 12:16:51 +0200
  4. Subject: [PATCH] meson: only require cpp for windows
  5. Allow to compile cairo without c++ toolchain.
  6. Fixes:
  7. - http://autobuild.buildroot.net/results/98b62ab7ed3092f9f9085f723baf7d6267451e5c/
  8. Upstream: https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/573
  9. Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
  10. ---
  11. meson.build | 4 +++-
  12. 1 file changed, 3 insertions(+), 1 deletion(-)
  13. diff --git a/meson.build b/meson.build
  14. index 9100152ee..297482b03 100644
  15. --- a/meson.build
  16. +++ b/meson.build
  17. @@ -1,4 +1,4 @@
  18. -project('cairo', 'c', 'cpp',
  19. +project('cairo', 'c',
  20. meson_version: '>= 0.59.0',
  21. version: run_command(find_program('version.py'), check: true).stdout().strip(),
  22. default_options: ['warning_level=2'],
  23. @@ -489,6 +489,8 @@ if host_machine.system() == 'darwin' and not get_option('quartz').disabled()
  24. endif
  25. if host_machine.system() == 'windows'
  26. + add_languages('cpp')
  27. +
  28. add_project_arguments('-DWIN32_LEAN_AND_MEAN', '-DNOMINMAX', language: ['c', 'cpp'])
  29. win32_extra_deps = [
  30. --
  31. 2.45.2