From 0d621460cec78c2dd08f29b1b0cc87bfc20b8ee4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Fri, 11 Sep 2020 20:42:36 +0200 Subject: [PATCH] Filter out LTO flags from %%extension flags macros Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1877652 --- macros | 4 +++- redhat-rpm-config.spec | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/macros b/macros index 3a287c0..cf4819d 100644 --- a/macros +++ b/macros @@ -111,7 +111,9 @@ %__extension_strip_flags() %{lua: local name = rpm.expand("%{1}") local value = " " .. rpm.expand("%{build_" .. name .. "}") -local result = string.gsub(value, "%s+-specs=[^%s]+", " ") +local specs_pattern = "%s+-specs=[^%s]+" +local lto_flags_pattern = rpm.expand("%{?_lto_cflags}"):gsub("[%-%.]", "%%%1") +local result = value:gsub(specs_pattern, " "):gsub(lto_flags_pattern, "") print(result) } diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec index cd65865..7381c12 100644 --- a/redhat-rpm-config.spec +++ b/redhat-rpm-config.spec @@ -6,7 +6,7 @@ Summary: Red Hat specific rpm configuration files Name: redhat-rpm-config -Version: 171 +Version: 172 Release: 1%{?dist} # No version specified. License: GPL+ @@ -213,6 +213,10 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora/srpm forge.lua %{_rpmconfigdir}/macros.d/macros.kmp %changelog +* Fri Sep 11 2020 Miro Hrončok - 172-1 +- Filter out LTO flags from %%extension flags macros +- Fixes: rhbz#1877652 + * Wed Sep 2 2020 Michel Alexandre Salim - 171-1 - Add Requires: lua-srpm-macros