[glib/wip/pwithnall/962-drop-embedded-pcre: 5/5] build: Drop unused pcre_objects+pcre_deps variables in meson.build
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/wip/pwithnall/962-drop-embedded-pcre: 5/5] build: Drop unused pcre_objects+pcre_deps variables in meson.build
- Date: Wed, 16 Jun 2021 16:48:34 +0000 (UTC)
commit 54154d68bf560a5da23873fafeef353f79599f16
Author: Philip Withnall <pwithnall endlessos org>
Date: Wed Jun 16 12:53:35 2021 +0100
build: Drop unused pcre_objects+pcre_deps variables in meson.build
After the previous few commits, these are now redundant.
Signed-off-by: Philip Withnall <pwithnall endlessos org>
glib/meson.build | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
---
diff --git a/glib/meson.build b/glib/meson.build
index 9cce4a224..7a294677f 100644
--- a/glib/meson.build
+++ b/glib/meson.build
@@ -20,7 +20,7 @@ libsysprof_capture_dep = dependency('sysprof-capture-4', version: '>= 3.38.0',
)
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/3937>. When we can depend
# 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']
endif
-pcre_deps = [pcre]
-pcre_objects = []
-
glib_c_args = ['-DG_LOG_DOMAIN="GLib"', '-DGLIB_COMPILATION'] + pcre_static_args +
glib_hidden_visibility_args
libglib = library('glib-2.0',
glib_dtrace_obj, glib_dtrace_hdr,
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,
soversion : soversion,
darwin_versions : darwin_versions,
@@ -369,7 +366,7 @@ libglib = library('glib-2.0',
# intl.lib is not compatible with SAFESEH
link_args : [noseh_link_args, glib_link_flags, win32_ldflags],
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,
objc_args : glib_c_args,
)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]