luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-05-20 20:42:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fatal-meson-warnings' into 'glib-2-70'

Browse Source 
meson: fix warnings for extract_all_objects function

See merge request GNOME/glib!2304
This commit is contained in:
Philip Withnall 2021-10-21 09:35:16 +00:00
commit 359a837ee4
3 changed files with 7 additions and 7 deletions
Show Stats 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,

2
subprojects/proxy-libintl.wrap
View File

@ -1,5 +1,5 @@
[wrap-git] [wrap-git]
directory=proxy-libintl directory=proxy-libintl
url=https://github.com/frida/proxy-libintl.git url=https://github.com/frida/proxy-libintl.git
revision=0.1 revision=0.2
depth=1 depth=1