From 6d30ca5699cef641d4786d5ff941e5d50054d577 Mon Sep 17 00:00:00 2001 From: David Abdurachmanov Date: Mon, 3 Apr 2023 17:21:51 +0300 Subject: [PATCH] Remove if-statement from macros Breaks everything: [..] error: /builddir/build/SPECS/kf5-kbookmarks.spec: line 53: %endif with no %if error: /usr/lib/rpm/redhat/macros: line 368: Macro %else has empty body error: /usr/lib/rpm/redhat/macros: line 371: Macro %endif has empty body [..] Signed-off-by: David Abdurachmanov --- macros | 4 ---- redhat-rpm-config.spec | 5 ++++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/macros b/macros index f431b6b..1e1f45c 100644 --- a/macros +++ b/macros @@ -363,12 +363,8 @@ print(result) # way we can detect installing an unusable .o/.a file. This is on the TODO # list for F34. %_gcc_lto_cflags -flto=auto -ffat-lto-objects -%ifnarch riscv64 -%_clang_lto_cflags -flto=thin -%else # riscv64 does not have ld.gold support needed for LTO with Clang. %_clang_lto_cflags %{nil} -%endif %_lto_cflags %{expand:%%{_%{toolchain}_lto_cflags}} # Default fortification level. diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec index c14e768..f2afca2 100644 --- a/redhat-rpm-config.spec +++ b/redhat-rpm-config.spec @@ -9,7 +9,7 @@ Summary: Red Hat specific rpm configuration files Name: redhat-rpm-config Version: %{baserelease} -Release: 1.1.riscv64%{?dist} +Release: 1.2.riscv64%{?dist} # No version specified. License: GPL+ URL: https://src.fedoraproject.org/rpms/redhat-rpm-config @@ -252,6 +252,9 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora/srpm forge.lua %doc buildflags.md %changelog +* Mon Apr 03 2023 David Abdurachmanov - 252-1.2.riscv64 +- Set %%_clang_lto_cflags to %%{nil} on all + * Mon Apr 03 2023 David Abdurachmanov - 252-1.1.riscv64 - Set %%_clang_lto_cflags to %%{nil} on riscv64 to disable LTO with Clang