Skip to content

Commit 29eafe6

Browse files
committed
gcc-14:
- fix build of fmt, since it has a bug, this is solved later, when upgrading fmt (when there is a new release)
1 parent d331e7b commit 29eafe6

File tree

2 files changed

+21
-1
lines changed

2 files changed

+21
-1
lines changed

subprojects/fmt.wrap

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ patch_url = https://wrapdb.mesonbuild.com/v2/fmt_10.2.0-2/get_patch
88
patch_hash = 2428c3a386a8390c76378f81ef804a297f4edc3b789499dd56629b7902b8ddb7
99
source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/fmt_10.2.0-2/fmt-10.2.0.tar.gz
1010
wrapdb_version = 10.2.0-2
11-
diff_files = fmt_dependency_override.diff
11+
# TODO: remove the second after a new release (it's fixed after > 120.2.1)
12+
diff_files = fmt_dependency_override.diff, fmt-10.2.0-gcc-bug.diff
1213

1314
[provide]
1415
fmt = fmt_dep
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
diff --git a/meson.build b/meson.build
2+
index 45cd1d1..13b276d 100644
3+
--- a/meson.build
4+
+++ b/meson.build
5+
@@ -1,10 +1,13 @@
6+
project('fmt', 'cpp', version: '10.2.0', license: 'MIT WITH fmt-exception', default_options: ['cpp_std=c++14'])
7+
8+
+#TODO: remove with the next release
9+
+cpp = meson.get_compiler('cpp')
10+
+
11+
fmt_private_cpp_args = []
12+
fmt_interface_cpp_args = []
13+
if get_option('default_library') == 'shared'
14+
fmt_private_cpp_args += ['-DFMT_LIB_EXPORT']
15+
- fmt_interface_cpp_args += ['-DFMT_SHARED']
16+
+ fmt_interface_cpp_args += ['-DFMT_SHARED', cpp.get_supported_arguments('-Wno-tautological-compare'),]
17+
endif
18+
19+
fmt_lib = library(

0 commit comments

Comments
 (0)