From 3a95e897074f939b7c75f5a8e90fd21bad615bf1 Mon Sep 17 00:00:00 2001
From: "Alexander A. Klimov" <alexander.klimov@icinga.com>
Date: Tue, 9 Feb 2021 14:19:02 +0100
Subject: [PATCH] Make the LTO condition actually effective
---
icinga2.spec | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/icinga2.spec b/icinga2.spec
index 519bd5b..9472b99 100644
--- a/icinga2.spec
+++ b/icinga2.spec
@@ -68,15 +68,6 @@
%bcond_without unity_build
%endif
-# Disable lto_build for older compiler versions
-# see https://github.com/Icinga/icinga2/issues/7149
-# lto1: internal compiler error: in prune_unused_types_prune, at dwarf2out.c
-%if "%{_vendor}" == "suse" && 0%{?suse_version} < 1315 || "%{_vendor}" == "redhat" && (0%{?el7} || 0%{?rhel} == 7 || "%{?dist}" == ".el7")
-%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
@@ -372,11 +363,16 @@ CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_UNITY_BUILD=ON"
%else
CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_UNITY_BUILD=OFF"
%endif
-%if %{with lto_build}
+
+# Disable LTO build for older compiler versions
+# see https://github.com/Icinga/icinga2/issues/7149
+# lto1: internal compiler error: in prune_unused_types_prune, at dwarf2out.c
+%if "%{_vendor}" == "suse" && 0%{?suse_version} < 1315 || "%{_vendor}" == "redhat" && (0%{?el7} || 0%{?rhel} == 7 || "%{?dist}" == ".el7")
CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_LTO_BUILD=ON"
-%else
+%else # suse_version 1315
CMAKE_OPTS="$CMAKE_OPTS -DICINGA2_LTO_BUILD=OFF"
-%endif
+%endif # suse_version 1315
+
%if %{with systemd_and_init}
CMAKE_OPTS="$CMAKE_OPTS -DINSTALL_SYSTEMD_SERVICE_AND_INITSCRIPT=ON"
%else
--
GitLab