Fix clang compilation of libdwarf on macOS 13

niklaut · Nov 16, 2023 · b17c7b1 · b17c7b1
1 parent c38d8ed
commit b17c7b1
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/subprojects/libdwarf.wrap b/subprojects/libdwarf.wrap
@@ -5,4 +5,4 @@ source_url = https://www.prevanders.net/libdwarf-0.7.0.tar.xz
 source_filename = libdwarf-0.7.0.tar.xz
 source_hash = 23b71829de875fa5842e49f232c8ee1a5043805749738bc61424d9abc1189f38
 
-diff_files = ./libdwarf/0001-fix-Use-project_source_root-for-subproject-compatibi.patch
+diff_files = ./libdwarf/0001-fix-Use-project_source_root-for-subproject-compatibi.patch, ./libdwarf/0002-fix-compilation-clang.patch
diff --git a/subprojects/packagefiles/libdwarf/0002-fix-compilation-clang.patch b/subprojects/packagefiles/libdwarf/0002-fix-compilation-clang.patch
@@ -0,0 +1,15 @@
+diff --git a/meson.build b/meson.build
+index 83ecd99..4d3fb4e 100644
+--- a/meson.build
++++ b/meson.build
+@@ -87,7 +87,11 @@ libdwarf_args = [ '-D__USE_MINGW_ANSI_STDIO=0' ]
+ if cc.get_id() == 'msvc'
+   libdwarf_args += [ '-D_CRT_NONSTDC_NO_WARNINGS', '-D_CRT_SECURE_NO_WARNINGS' ]
+ endif
++if cc.get_id() == 'clang'
++  add_project_arguments('-Wno-error=unused-but-set-variable', language: 'c')
++  add_project_arguments('-Wno-error=strict-prototypes', language: 'c')
++endif
+
+ config_dir = [include_directories('.')]
+