[libgit2-glib] meson: Remove workaround comment and add proper fix to NDEBUG
- From: Alberto Fanjul <albfan src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgit2-glib] meson: Remove workaround comment and add proper fix to NDEBUG
- Date: Fri, 21 May 2021 07:29:05 +0000 (UTC)
commit da5fc851748dba13df1c58a055bcb188345242fa
Author: Iñigo Martínez <inigomartinez gmail com>
Date: Thu May 20 20:11:53 2021 +0200
meson: Remove workaround comment and add proper fix to NDEBUG
Due to an issue with meson's `buildtype` and `b_ndebug` options[0],
the `b_ndebug` option was converted to a combo option.
This forced `libgit2-glib` to use a workaround that has ended being
the standard meson's behavior. The `b_ndebug` option has also gained
another option called `if-release`.
Due to this changes, the workaround comment has been removed and
proper fix has been used in place.
[0] https://github.com/mesonbuild/meson/pull/1896
meson.build | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
---
diff --git a/meson.build b/meson.build
index ab37219..f3e6b41 100644
--- a/meson.build
+++ b/meson.build
@@ -99,9 +99,7 @@ else
]
endif
-# Workaround for meson's bug
-# https://github.com/mesonbuild/meson/pull/1896
-if get_option('b_ndebug') == 'true'
+if ['true', 'if-release'].contains(get_option('b_ndebug'))
common_flags += ['-DG_DISABLE_ASSERT']
endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]