Skip to content
Snippets Groups Projects
Commit 11518ae2 authored by Alexander A. Klimov's avatar Alexander A. Klimov :sunglasses:
Browse files

Merge branch '2.11' into '2.11'

Release 2.11.10-1

See merge request !23
parents e62a6d97 0fe9ef4a
No related branches found
No related tags found
1 merge request!23Release 2.11.10-1
Pipeline #19123 failed
......@@ -68,14 +68,6 @@
%bcond_without unity_build
%endif
# Disable lto_build for older SUSE versions
# see https://github.com/Icinga/icinga2/issues/7149
%if "%{_vendor}" == "suse" && 0%{?suse_version} <= 1315
%bcond_with lto_build
%else # suse_version 1315
%bcond_without lto_build
%endif # suse_version 1315
%bcond_with systemd_and_init
%bcond_without compat
%bcond_without livestatus
......@@ -97,7 +89,7 @@ License: GPLv2+
%endif # suse
Group: System/Monitoring
Name: icinga2
Version: 2.11.9
Version: 2.11.10
Release: %{revision}%{?dist}
Url: https://www.icinga.com/
Source: https://github.com/Icinga/%{name}/archive/v%{version}.tar.gz
......@@ -371,11 +363,11 @@ CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_UNITY_BUILD=ON"
%else
CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_UNITY_BUILD=OFF"
%endif
%if %{with lto_build}
CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_LTO_BUILD=ON"
%else
# Disable LTO build, see https://github.com/Icinga/icinga2/issues/7149
# lto1: internal compiler error: in prune_unused_types_prune, at dwarf2out.c
CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_LTO_BUILD=OFF"
%endif
%if %{with systemd_and_init}
CMAKE_OPTS="$CMAKE_OPTS -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON"
%else
......@@ -832,6 +824,9 @@ fi
%{_datadir}/nano/%{name}.nanorc
%changelog
* Wed Jul 14 2021 Julian Brost <julian.brost@icinga.com> 2.11.10-1
- Update to 2.11.10
* Thu May 27 2021 Julian Brost <julian.brost@icinga.com> 2.11.9-1
- Update to 2.11.9
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment