rpms/git
6
0
Fork 0
Code Issues Pull Requests Releases Activity

set path to linker script in %_package_note_file

Browse Source 
The package-notes feature¹ creates a linker script in %{buildsubdir}.
Unfortunately, %{buildsubdir} is not set in %prep, leaving us with an
incorrect path to the linker script.  The build then fails with:

   /usr/bin/ld: cannot open linker script file
   /builddir/build/BUILD/.package_note-git-2.35.0-0.2.rc2.fc36.3.x86_64.ld:
   No such file or directory

Set the path to the linker script via %_package_note_file, per
suggestion by Zbigniew Jędrzejewski-Szmek².

References:
¹ https://fedoraproject.org/wiki/Changes/Package_information_on_ELF_objects
² https://bugzilla.redhat.com/2044028#c10
This commit is contained in:
Todd Zullinger 2022-01-24 15:33:49 -05:00
parent 4eb061b209
commit 1dc07e7d5d
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
git.spec
View File

@ -76,6 +76,9 @@
%global _hardened_build 1 %global _hardened_build 1
%endif %endif
# Set path to the package-notes linker script
%global _package_note_file %{_builddir}/%{name}-%{version}/.package_note-%{name}-%{version}-%{release}.%{_arch}.ld
# Define for release candidates # Define for release candidates
#global rcrev .rc0 #global rcrev .rc0
@ -1017,6 +1020,7 @@ rmdir --ignore-fail-on-non-empty "$testdir"
%changelog %changelog
* Mon Jan 24 2022 Todd Zullinger <tmz@pobox.com> - 2.35.0-1 * Mon Jan 24 2022 Todd Zullinger <tmz@pobox.com> - 2.35.0-1
- update to 2.35.0 - update to 2.35.0
- set path to linker script in %%_package_note_file
* Sat Jan 22 2022 Todd Zullinger <tmz@pobox.com> - 2.35.0-0.2.rc2.3 * Sat Jan 22 2022 Todd Zullinger <tmz@pobox.com> - 2.35.0-0.2.rc2.3
- remove contrib/scalar to avoid cruft in git-core-doc - remove contrib/scalar to avoid cruft in git-core-doc