luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-29 08:56:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

build: Drop unused pcre_objects+pcre_deps variables in meson.build

Browse Source 
After the previous few commits, these are now redundant.

Signed-off-by: Philip Withnall <pwithnall@endlessos.org>
This commit is contained in:
Philip Withnall 2021-06-16 12:53:35 +01:00
parent 9570e67744
commit 54154d68bf
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
glib/meson.build
View File

@ -20,7 +20,7 @@ libsysprof_capture_dep = dependency('sysprof-capture-4', version: '>= 3.38.0',
) )
glib_conf.set('HAVE_SYSPROF', libsysprof_capture_dep.found()) glib_conf.set('HAVE_SYSPROF', libsysprof_capture_dep.found())
# TODO: gnulib_objects, pcre_objects and pcre_deps are a workaround for # TODO: gnulib_objects is a workaround for
# <https://github.com/mesonbuild/meson/issues/3934> and # <https://github.com/mesonbuild/meson/issues/3934> and
# <https://github.com/mesonbuild/meson/issues/3937>. When we can depend # <https://github.com/mesonbuild/meson/issues/3937>. When we can depend
# on a meson version where those are fixed, revert the commit that # on a meson version where those are fixed, revert the commit that
@ -354,14 +354,11 @@ if use_pcre_static_flag
pcre_static_args = ['-DPCRE_STATIC'] pcre_static_args = ['-DPCRE_STATIC']
endif endif
pcre_deps = [pcre]
pcre_objects = []
glib_c_args = ['-DG_LOG_DOMAIN="GLib"', '-DGLIB_COMPILATION'] + pcre_static_args + glib_hidden_visibility_args glib_c_args = ['-DG_LOG_DOMAIN="GLib"', '-DGLIB_COMPILATION'] + pcre_static_args + glib_hidden_visibility_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 + pcre_objects, objects : [charset_lib.extract_all_objects()] + gnulib_objects,
version : library_version, version : library_version,
soversion : soversion, soversion : soversion,
darwin_versions : darwin_versions, darwin_versions : darwin_versions,
@ -369,7 +366,7 @@ libglib = library('glib-2.0',
# intl.lib is not compatible with SAFESEH # intl.lib is not compatible with SAFESEH
link_args : [noseh_link_args, glib_link_flags, win32_ldflags], link_args : [noseh_link_args, glib_link_flags, win32_ldflags],
include_directories : configinc, include_directories : configinc,
dependencies : pcre_deps + [thread_dep, librt] + libintl_deps + libiconv + platform_deps + [gnulib_libm_dependency, libm] + [libsysprof_capture_dep], dependencies : [pcre, thread_dep, librt] + libintl_deps + libiconv + platform_deps + [gnulib_libm_dependency, libm] + [libsysprof_capture_dep],
c_args : glib_c_args, c_args : glib_c_args,
objc_args : glib_c_args, objc_args : glib_c_args,
) )