From d74221c906e1280adf0529ec2bd3c27a598ad0e7 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mar 25 2019 16:02:56 +0000 Subject: Set -Db_ndebug=true Signed-off-by: Igor Gnatenko --- diff --git a/0001-rpm-Always-set-b_ndebug-to-true.patch b/0001-rpm-Always-set-b_ndebug-to-true.patch new file mode 100644 index 0000000..89824e2 --- /dev/null +++ b/0001-rpm-Always-set-b_ndebug-to-true.patch @@ -0,0 +1,27 @@ +From 1afae5c4e8e5fcb3028bb36cd4e1fa9c41600dd7 Mon Sep 17 00:00:00 2001 +From: Igor Gnatenko +Date: Mon, 25 Mar 2019 17:00:32 +0100 +Subject: [PATCH] rpm: Always set b_ndebug to true + +'if-release' does not catch buildtype=plain, so we need to do this. + +Signed-off-by: Igor Gnatenko +--- + data/macros.meson | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/data/macros.meson b/data/macros.meson +index 05d21e58..431a90c3 100644 +--- a/data/macros.meson ++++ b/data/macros.meson +@@ -21,6 +21,7 @@ + --sharedstatedir=%{_sharedstatedir} \ + --wrap-mode=%{__meson_wrap_mode} \ + --auto-features=%{__meson_auto_features} \ ++ -Db_ndebug=true \ + %{_vpath_srcdir} %{_vpath_builddir} \ + %{nil}} + +-- +2.21.0 + diff --git a/meson.spec b/meson.spec index 2613d6a..aaec26d 100644 --- a/meson.spec +++ b/meson.spec @@ -4,12 +4,14 @@ Name: meson Version: 0.50.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: High productivity build system License: ASL 2.0 URL: http://mesonbuild.com/ -Source0: https://github.com/mesonbuild/meson/archive/%{version}/%{name}-%{version}.tar.gz +Source: https://github.com/mesonbuild/meson/archive/%{version}/%{name}-%{version}.tar.gz +# https://github.com/mesonbuild/meson/pull/5142 +Patch0001: 0001-rpm-Always-set-b_ndebug-to-true.patch BuildArch: noarch Obsoletes: %{name}-gui < 0.31.0-3 @@ -101,6 +103,9 @@ export MESON_PRINT_TEST_OUTPUT=1 %{_datadir}/polkit-1/actions/com.mesonbuild.install.policy %changelog +* Mon Mar 25 2019 Igor Gnatenko - 0.50.0-2 +- Set -Db_ndebug=true + * Sun Mar 10 2019 Igor Gnatenko - 0.50.0-1 - Update to 0.50.0