rpms
/
redhat-rpm-config
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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 <davidlt@rivosinc.com>
This commit is contained in:
David Abdurachmanov 2023-04-03 17:21:51 +03:00
parent f4aa489194
commit 6d30ca5699
Signed by: davidlt
GPG Key ID: 8B7F1DA0E2C9FDBB
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
macros
View File

@ -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.

5
redhat-rpm-config.spec
View File

@ -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 <davidlt@rivosinc.com> - 252-1.2.riscv64
- Set %%_clang_lto_cflags to %%{nil} on all
* Mon Apr 03 2023 David Abdurachmanov <davidlt@rivosinc.com> - 252-1.1.riscv64
- Set %%_clang_lto_cflags to %%{nil} on riscv64 to disable LTO with Clang