[glib: 10/10] Merge branch 'meson-version-policy' into 'main'
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib: 10/10] Merge branch 'meson-version-policy' into 'main'
- Date: Tue, 10 May 2022 11:43:44 +0000 (UTC)
commit b18fec9f238d5604f43071c95460e7af58875bd5
Merge: 7c4b4cda34 cc79d5bc7f
Author: Philip Withnall <philip tecnocode co uk>
Date: Tue May 10 11:43:41 2022 +0000
Merge branch 'meson-version-policy' into 'main'
docs: Add a Meson version policy and bump Meson version in CI
Closes #2596
See merge request GNOME/glib!2641
.gitlab-ci.yml | 34 ++++++++++-----------
.gitlab-ci/android-ndk.Dockerfile | 2 +-
.gitlab-ci/coverity.Dockerfile | 2 +-
.gitlab-ci/debian-stable.Dockerfile | 2 +-
.gitlab-ci/fedora.Dockerfile | 2 +-
.gitlab-ci/mingw.Dockerfile | 2 +-
.gitlab-ci/test-msvc.bat | 2 +-
.gitlab-ci/test-msys2.sh | 2 +-
INSTALL.in | 4 ++-
docs/meson-version.md | 30 +++++++++++++++++++
docs/reference/meson.build | 3 --
gio/gio-querymodules-wrapper.py | 9 ------
gio/meson.build | 35 +++++++---------------
gio/tests/meson.build | 4 +--
glib/gnulib/gl_cv_cc_double_expbit0/meson.build | 2 +-
glib/gnulib/gl_cv_func_frexp_works/meson.build | 2 +-
glib/gnulib/gl_cv_func_frexpl_works/meson.build | 2 +-
glib/gnulib/gl_cv_func_ldexpl_works/meson.build | 2 +-
.../gl_cv_func_printf_directive_a/meson.build | 2 +-
.../gl_cv_func_printf_directive_f/meson.build | 2 +-
.../gl_cv_func_printf_directive_ls/meson.build | 2 +-
glib/gnulib/gl_cv_func_printf_enomem/meson.build | 2 +-
.../gl_cv_func_printf_flag_grouping/meson.build | 2 +-
.../gl_cv_func_printf_flag_leftadjust/meson.build | 2 +-
.../gnulib/gl_cv_func_printf_flag_zero/meson.build | 2 +-
glib/gnulib/gl_cv_func_printf_infinite/meson.build | 2 +-
.../meson.build | 2 +-
.../gl_cv_func_printf_long_double/meson.build | 2 +-
.../gnulib/gl_cv_func_printf_precision/meson.build | 2 +-
glib/meson.build | 17 ++++-------
glib/tests/meson.build | 2 +-
gmodule/meson.build | 10 +++----
gobject/meson.build | 13 +++-----
gthread/meson.build | 5 +---
meson.build | 35 +++++++---------------
subprojects/pcre.wrap | 14 ++++-----
tests/meson.build | 4 +--
37 files changed, 121 insertions(+), 142 deletions(-)
---
diff --cc meson.build
index 13f28638a6,f126282cc4..1619cfa2e9
--- a/meson.build
+++ b/meson.build
@@@ -1714,9 -1701,9 +1701,9 @@@ va_list_val_copy_prog = ''
if cc_can_run
rres = cc.run(va_list_val_copy_prog, name : 'va_lists can be copied as values')
- glib_va_val_copy = rres.returncode() == 0
+ glib_va_val_copy = rres.compiled() and rres.returncode() == 0
else
- glib_va_val_copy = meson.get_cross_property('va_val_copy', true)
+ glib_va_val_copy = meson.get_external_property('va_val_copy', true)
endif
if not glib_va_val_copy
glib_vacopy = glib_vacopy + '\n#define G_VA_COPY_AS_ARRAY 1'
@@@ -1993,9 -1980,9 +1980,9 @@@ stack_grows_check_prog = ''
if cc_can_run
rres = cc.run(stack_grows_check_prog, name : 'stack grows check')
- growing_stack = rres.returncode() == 0
+ growing_stack = rres.compiled() and rres.returncode() == 0
else
- growing_stack = meson.get_cross_property('growing_stack', false)
+ growing_stack = meson.get_external_property('growing_stack', false)
endif
glibconfig_conf.set10('G_HAVE_GROWING_STACK', growing_stack)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]