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

Merge branch 'c9-beta' into a9-beta

Browse Source
This commit is contained in:
eabdullin 2024-03-28 11:39:28 +00:00 committed by eabdullin
commit 19740bcbd1
4 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
SOURCES/brp-llvm-compile-lto-elf
View File

@ -48,5 +48,7 @@ check_convert_bitcode () {
echo "Checking for LLVM bitcode artifacts" echo "Checking for LLVM bitcode artifacts"
export -f check_convert_bitcode export -f check_convert_bitcode
find "$RPM_BUILD_ROOT" -type f -name "*.[ao]" -print0 | \ # Deduplicate by device:inode to avoid processing hardlinks in parallel.
xargs -0 -r -n1 -P$NCPUS sh -c "check_convert_bitcode \$@ $CLANG_FLAGS" ARG0 find "$RPM_BUILD_ROOT" -type f -name "*.[ao]" -printf "%D:%i %p\n" | \
awk '!seen[$1]++' | cut -d" " -f2- | \
xargs -d"\n" -r -n1 -P$NCPUS sh -c "check_convert_bitcode \$@ $CLANG_FLAGS" ARG0

2
SOURCES/brp-python-bytecompile
View File

@ -57,7 +57,7 @@ function python_bytecompile()
# -x and -e together implements the same functionality as the Filter class below # -x and -e together implements the same functionality as the Filter class below
# -s strips $RPM_BUILD_ROOT from the path # -s strips $RPM_BUILD_ROOT from the path
# -p prepends the leading slash to the path to make it absolute # -p prepends the leading slash to the path to make it absolute
$python_binary -B $options -m compileall -q -f $exclude -s $RPM_BUILD_ROOT -p / -e $RPM_BUILD_ROOT $python_libdir $python_binary -B $options -m compileall -q -f $exclude -s $RPM_BUILD_ROOT -p / -e $RPM_BUILD_ROOT --invalidation-mode=timestamp $python_libdir
# #
# Python 3.4 and higher # Python 3.4 and higher

3
SOURCES/redhat-hardened-cc1
View File

@ -1,2 +1,5 @@
*cc1_options: *cc1_options:
+ %{!r:%{!fpie:%{!fPIE:%{!fpic:%{!fPIC:%{!fno-pic:-fPIE}}}}}} + %{!r:%{!fpie:%{!fPIE:%{!fpic:%{!fPIC:%{!fno-pic:-fPIE}}}}}}
*cpp_options:
+ %{!r:%{!fpie:%{!fPIE:%{!fpic:%{!fPIC:%{!fno-pic:-fPIE}}}}}}

24
SPECS/redhat-rpm-config.spec
View File

@ -6,7 +6,7 @@
Summary: Red Hat specific rpm configuration files Summary: Red Hat specific rpm configuration files
Name: redhat-rpm-config Name: redhat-rpm-config
Version: 201 Version: 207
Release: 1%{?dist}.alma Release: 1%{?dist}.alma
# No version specified. # No version specified.
License: GPL+ License: GPL+
@ -129,6 +129,7 @@ Requires: %{_bindir}/xargs
# for brp-llvm-compile-lto-elf # for brp-llvm-compile-lto-elf
Requires: (llvm if clang) Requires: (llvm if clang)
Requires: (gawk if clang)
# -fstack-clash-protection and -fcf-protection require GCC 8. # -fstack-clash-protection and -fcf-protection require GCC 8.
Conflicts: gcc < 8.0.1-0.22 Conflicts: gcc < 8.0.1-0.22
@ -253,9 +254,28 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora/srpm forge.lua
%doc buildflags.md %doc buildflags.md
%changelog %changelog
* Thu Sep 21 2023 Eduard Abdullin <eabdullin@almalinux.org> - 201-1.alma * Thu Mar 28 2024 Eduard Abdullin <eabdullin@almalinux.org> - 207-1.alma
- Fix AlmaLinux detection - Fix AlmaLinux detection
* Thu Jan 18 2024 Miro Hrončok <mhroncok@redhat.com> - 207-1
- brp-python-bytecompile: Pass --invalidation-mode=timestamp to compileall
- Resolves: RHEL-22139
* Mon Oct 02 2023 Nikita Popov <npopov@redhat.com> - 206-1
- Use correct format specifier in brp-llvm-compile-lto-elf
* Fri Sep 29 2023 Nikita Popov <npopov@redhat.com> - 205-1
- Fix the fix for brp-llvm-compile-lto-elf
* Tue Sep 26 2023 Florian Weimer <fweimer@redhat.com> - 204-1
- Enable PIC mode for assembler files (RHEL-6298)
* Wed Sep 13 2023 Florian Weimer <fweimer@redhat.com> - 203-1
- Rebuild against more recent downstream branch (#2234024)
* Fri Aug 25 2023 Nikita Popov <npopov@redhat.com> - 202-1
- Fix brp-llvm-compile-lto-elf parallelism with hardlinks
- Resolves: rhbz#2234024
* Mon May 08 2023 Nikita Popov <npopov@redhat.com> - 201-1 * Mon May 08 2023 Nikita Popov <npopov@redhat.com> - 201-1
- Add llvm dependency if clang toolchain used - Add llvm dependency if clang toolchain used
- Resolves: rhbz#2193406 - Resolves: rhbz#2193406