luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-09-27 17:52:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

meson: fix warnings for extract_all_objects function

Browse Source 
The "recursive:" kwarg is available in the targeted minimum version of
meson, and is basically required if you want to not emit warnings and
maybe error with --fatal-meson-warnings.

The current default behavior is false, so explicitly opt in to that value.
None of these internal libraries use recursive objects anyway.

In commit c74d87e44038925baf37367ce124c027e225c11e we went a different
route, and upgraded the minimum meson version and dropped the TODO
workarounds in these files. But for a stable branch this is not
desirable.
This commit is contained in:
Eli Schwartz
2021-10-06 16:56:54 -04:00
parent 7c9b1781e4
commit 397840eb18
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gio/meson.build
View File

@@ -419,7 +419,7 @@ if host_system != 'windows'
subdir('xdgmime') subdir('xdgmime')
internal_deps += [xdgmime_lib] internal_deps += [xdgmime_lib]
internal_objects += [xdgmime_lib.extract_all_objects()] internal_objects += [xdgmime_lib.extract_all_objects(recursive: false)]
install_headers(gio_unix_include_headers, subdir : 'gio-unix-2.0/gio') install_headers(gio_unix_include_headers, subdir : 'gio-unix-2.0/gio')
@@ -758,20 +758,20 @@ gioenumtypes_dep = declare_dependency(sources : [gioenumtypes_h, glib_enumtypes_
if glib_conf.has('HAVE_SYS_INOTIFY_H') and have_func_inotify_init1 if glib_conf.has('HAVE_SYS_INOTIFY_H') and have_func_inotify_init1
subdir('inotify') subdir('inotify')
internal_deps += [ inotify_lib ] internal_deps += [ inotify_lib ]
internal_objects += [inotify_lib.extract_all_objects()] internal_objects += [inotify_lib.extract_all_objects(recursive: false)]
endif endif
# kevent # kevent
if have_func_kqueue and have_func_kevent if have_func_kqueue and have_func_kevent
subdir('kqueue') subdir('kqueue')
internal_deps += [ kqueue_lib ] internal_deps += [ kqueue_lib ]
internal_objects += [kqueue_lib.extract_all_objects()] internal_objects += [kqueue_lib.extract_all_objects(recursive: false)]
endif endif
if host_system == 'windows' if host_system == 'windows'
subdir('win32') subdir('win32')
internal_deps += [ giowin32_lib ] internal_deps += [ giowin32_lib ]
internal_objects += [giowin32_lib.extract_all_objects()] internal_objects += [giowin32_lib.extract_all_objects(recursive: false)]
endif endif
if have_bash if have_bash

4
glib/meson.build
View File

@@ -117,7 +117,7 @@ else
endif endif
subdir('gnulib') subdir('gnulib')
gnulib_objects = [gnulib_lib.extract_all_objects()] gnulib_objects = [gnulib_lib.extract_all_objects(recursive: false)]
endif endif
glib_headers = files( glib_headers = files(
@@ -359,7 +359,7 @@ glib_c_args = ['-DG_LOG_DOMAIN="GLib"', '-DGLIB_COMPILATION'] + pcre_static_args
libglib = library('glib-2.0', libglib = library('glib-2.0',
glib_dtrace_obj, glib_dtrace_hdr, glib_dtrace_obj, glib_dtrace_hdr,
sources : [deprecated_sources, glib_sources], sources : [deprecated_sources, glib_sources],
objects : [charset_lib.extract_all_objects()] + gnulib_objects, objects : [charset_lib.extract_all_objects(recursive: false)] + gnulib_objects,
version : library_version, version : library_version,
soversion : soversion, soversion : soversion,
darwin_versions : darwin_versions, darwin_versions : darwin_versions,