From 6024b1e611a3b9d1fe1ce329919f3e63f1aaeec0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timm=20B=C3=A4der?= Date: Wed, 22 Jun 2022 12:56:17 +0200 Subject: [PATCH] Move llvm_compile_lto_to_elf before __debug_install_post Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2082081 --- macros | 2 +- redhat-rpm-config.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/macros b/macros index 3300d9a..d10fa49 100644 --- a/macros +++ b/macros @@ -259,7 +259,6 @@ print(result) # packagers, don't undefine the entire macro, see the individual macros in /usr/lib/rpm/macros.d/macros.python-srpm %__os_install_post \ - %[ "%{toolchain}" == "clang" ? "%{?__brp_llvm_compile_lto_elf}" : "%{nil}" ] \ %{?__brp_ldconfig} \ %{?__brp_compress} \ %{!?__debug_package:\ @@ -275,6 +274,7 @@ print(result) %{nil} %__spec_install_post\ + %[ "%{toolchain}" == "clang" ? "%{?__brp_llvm_compile_lto_elf}" : "%{nil}" ] \ %{?__debug_package:%{__debug_install_post}}\ %{__arch_install_post}\ %{__os_install_post}\ diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec index d0dc87a..f88f5ec 100644 --- a/redhat-rpm-config.spec +++ b/redhat-rpm-config.spec @@ -4,7 +4,7 @@ # 2) When making changes, increment the version (in baserelease) by 1. # rpmdev-bumpspec and other tools update the macro below, which is used # in Version: to get the desired effect. -%global baserelease 225 +%global baserelease 226 Summary: Red Hat specific rpm configuration files Name: redhat-rpm-config @@ -219,6 +219,9 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora/srpm forge.lua %doc buildflags.md %changelog +* Wed Jun 22 2022 Timm Bäder - 226-1 +- Move llvm_compile_lto_to_elf before __debug_install_post + * Fri Jun 17 2022 Nick Clifton - 225-1 - Add definition of _find_debuginfo_extra_opts which will - move annobin data into a separate debuginfo file.