Switch to --package-metadata also with lld

This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2022-08-16 15:21:46 +02:00
parent 5c54ab3586
commit 9f2cdc9ab4
3 changed files with 62 additions and 6 deletions

57
changelog Normal file
View File

@ -0,0 +1,57 @@
* Tue Aug 16 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.5-3
- Switch to --package-metadata also with lld (#2051597)
* Tue Aug 09 2022 Luca Boccassi <bluca@debian.org> - 0.5-1
- Switch to --package-metadata (#2055863, #2083878, #2099999, #2059858, #2055458)
* Sat Aug 06 2022 Tom Stellard <tstellar@redhat.com> - 0.4-17
- Add CI test
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sat Mar 26 2022 Luca Boccassi <bluca@debian.org> - 0.4-15
- Fix wrong binary fields on big endian
* Tue Jan 25 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.4-14
- Disable notes when clang toolchain is used on arm
* Mon Jan 24 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.4-13
- Disable notes with linkers other than bfd
* Mon Jan 24 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.4-12
- Add --insert-after param to the note generation script
* Sat Jan 22 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.4-11
- Add %%_package_note_linker and document everything (rhbz#2043178,
rhbz#2043368)
* Sat Jan 22 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.4-10
- Allow unsetting %%_package_note_readonly to drop the READONLY attribute
* Fri Jan 21 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.4-9
- Use %%{buildsubdir} in %%_package_note_file if defined
* Fri Jan 21 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.4-8
- Also voidify the macros if we're on a noarch build
* Fri Jan 21 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.4-7
- Use $RPM_PACKAGE_VERSION variable to refer to the package version
* Fri Jan 21 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.4-6
- Make _generate_package_note_file always recreate the file
* Fri Jan 21 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.4-5
- Conditionalize all macros on %%_package_note_file being defined
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Fri Jan 14 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.4-3
- Rename srpm macros file
* Fri Jan 14 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.4-2
- Add package-notes-srpm-macros subpackage to configure rpm builds
* Tue Nov 16 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 0.4-1
- Version 0.4

View File

@ -9,9 +9,7 @@
#
# %undefine _package_note_flags
#
# Which linker will be used? This should be either "bfd", "gold", or "mold".
# Unfortunately "lld" does not support the --package-metadata flag so the note
# insertion is disabled when using it.
# Which linker will be used? This should be either "bfd", "gold", "mold", or "lld".
#
# (The default linker for clang on armv7hl is lld.)
%_package_note_linker %["%_target_cpu" == "armv7hl" && "%{toolchain}" == "clang" ? "lld" : "bfd"]
@ -21,7 +19,7 @@
%_generate_package_note_file %{nil}
# Overall status: 1 if looks like we can insert the note, 0 otherwise
%_package_note_status %[0%{?_package_note_file:1} && 0%{?name:1} && "%_target_cpu" != "noarch" && "%_package_note_linker" != "lld" ? 1 : 0]
%_package_note_status %[0%{?_package_note_file:1} && 0%{?name:1} && "%_target_cpu" != "noarch" && 1 : 0]
# The linker flags to be passed to the compiler to insert the notes section will
# be created by the spec file, to avoid issues with quoting and escaping across

View File

@ -19,9 +19,10 @@ for.
Summary: %{summary}
Obsoletes: package-notes < 0.5
# Those are minimum versions that implement --package-metadata
Conflicts: binutils < 2.38-23
Conflicts: binutils-gold < 2.38-23
Conflicts: binutils < 2.37-34
Conflicts: binutils-gold < 2.37-34
Conflicts: mold < 1.3.0
Conflicts: lld < 14.0.5-4
%description srpm-macros
RPM macros to insert a section with an ELF note with a JSON payload that