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

Use --config=xxx instead of two separate arguments

Browse Source 
Due to a bug in meson (https://github.com/mesonbuild/meson/issues/13278),
--config is erronously stripped from LDFLAGS if it's a separate argument.
Let's make it a single argument instead to work around the issue in meson.
This commit is contained in:
Daan De Meyer 2024-05-31 22:40:04 +02:00
parent 9dbac25eb3
commit b8adb5cfa6
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
macros
View File

@ -321,7 +321,7 @@ for k,_ in pairs(stripped_flags) do print(k .. " ") end
# from RPM spec files.
%_hardening_gcc_cflags -specs=/usr/lib/rpm/redhat/redhat-hardened-cc1
%_hardening_clang_cflags --config /usr/lib/rpm/redhat/redhat-hardened-clang.cfg
%_hardening_clang_cflags --config=/usr/lib/rpm/redhat/redhat-hardened-clang.cfg
%_hardening_cflags %{expand:%%{_hardening_%{toolchain}_cflags}} -fstack-protector-strong
# Have the linker generate errors instead of warnings for binaries that
@ -332,7 +332,7 @@ for k,_ in pairs(stripped_flags) do print(k .. " ") end
# we don't escape symbols '~', '"', etc. so be careful when changing this
%_hardening_gcc_ldflags -specs=/usr/lib/rpm/redhat/redhat-hardened-ld
%_hardening_clang_ldflags --config /usr/lib/rpm/redhat/redhat-hardened-clang-ld.cfg
%_hardening_clang_ldflags --config=/usr/lib/rpm/redhat/redhat-hardened-clang-ld.cfg
%_hardening_ldflags -Wl,-z,now %{expand:%%{_hardening_%{toolchain}_ldflags}}
# Harden packages by default for Fedora 23+:

6
redhat-rpm-config.spec
View File

@ -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 291
%global baserelease 292
Summary: Red Hat-family-specific rpm configuration files
Name: redhat-rpm-config
@ -254,6 +254,10 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora common.lua
%doc buildflags.md
%changelog
* Fri May 31 2024 Daan De Meyer <daan.j.demeyer@gmail.com> - 292-1
- Use --config=xxx for clang configs instead of two separate arguments to work
around a bug in meson
* Wed May 22 2024 Michal Domonkos <mdomonko@redhat.com> - 291-1
- Drop the now obsolete %%install override hack for debuginfo enablement