[glib/wip/add-built-headers-deps] glib: Also include glibconfig.h in the libglib dependencies and sources
- From: Marco Trevisan <marcotrevi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/wip/add-built-headers-deps] glib: Also include glibconfig.h in the libglib dependencies and sources
- Date: Thu, 20 Oct 2022 14:48:00 +0000 (UTC)
commit 3a494c32b3254a1021d1be512a0c159add2ba251
Author: Marco Trevisan (TreviƱo) <mail 3v1n0 net>
Date: Thu Oct 20 16:47:13 2022 +0200
glib: Also include glibconfig.h in the libglib dependencies and sources
It must be there to build, or we'd fail:
See: https://gitlab.gnome.org/GNOME/glib/-/jobs/2346909
glib/meson.build | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/glib/meson.build b/glib/meson.build
index 30dd52a8c3..4383490788 100644
--- a/glib/meson.build
+++ b/glib/meson.build
@@ -1,6 +1,4 @@
glibconfig_h = configure_file(input : 'glibconfig.h.in', output : 'glibconfig.h',
- install_dir : join_paths(get_option('libdir'), 'glib-2.0/include'),
- install_tag : 'devel',
configuration : glibconfig_conf)
gversionmacros_h = configure_file(
@@ -231,7 +229,7 @@ glib_sub_headers = files(
'gprintf.h',
)
-glib_built_headers = [gversionmacros_h, gvisibility_h]
+glib_built_headers = [glibconfig_h, gversionmacros_h, gvisibility_h]
glib_sub_headers += glib_built_headers
install_headers(glib_sub_headers, subdir : 'glib-2.0/glib')
@@ -389,7 +387,7 @@ endif
glib_c_args = ['-DG_LOG_DOMAIN="GLib"'] + glib_c_args_internal + pcre2_static_args
libglib = library('glib-2.0',
glib_dtrace_obj, glib_dtrace_hdr,
- sources : [deprecated_sources, glib_sources],
+ sources : [deprecated_sources, glib_sources, glib_built_headers],
version : library_version,
soversion : soversion,
darwin_versions : darwin_versions,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]