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

Import from AlmaLinux stable repository

Browse Source
This commit is contained in:
eabdullin 2024-05-15 08:50:12 +00:00
parent a3ad4e542d
commit 6a17fec42d
6 changed files with 44 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
.redhat-rpm-config.metadata
View File

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

2
SOURCES/macros
View File

@ -328,7 +328,7 @@ print(result)
# way we can detect installing an unusable .o/.a file. This is on the TODO # way we can detect installing an unusable .o/.a file. This is on the TODO
# list for F34. # list for F34.
%_gcc_lto_cflags -flto=auto -ffat-lto-objects %_gcc_lto_cflags -flto=auto -ffat-lto-objects
%_clang_lto_cflags -flto %_clang_lto_cflags -flto=thin
%_lto_cflags %{expand:%%{_%{toolchain}_lto_cflags}} %_lto_cflags %{expand:%%{_%{toolchain}_lto_cflags}}
%_general_options -O2 %{?_lto_cflags} -fexceptions -g -grecord-gcc-switches -pipe %_general_options -O2 %{?_lto_cflags} -fexceptions -g -grecord-gcc-switches -pipe

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}}}}}}

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

@ -6,8 +6,8 @@
Summary: Red Hat specific rpm configuration files Summary: Red Hat specific rpm configuration files
Name: redhat-rpm-config Name: redhat-rpm-config
Version: 199 Version: 207
Release: 1%{?dist}.alma Release: 1%{?dist}.alma.1
# No version specified. # No version specified.
License: GPL+ License: GPL+
URL: https://src.fedoraproject.org/rpms/redhat-rpm-config URL: https://src.fedoraproject.org/rpms/redhat-rpm-config
@ -127,6 +127,10 @@ Requires: %{_bindir}/grep
Requires: %{_bindir}/sed Requires: %{_bindir}/sed
Requires: %{_bindir}/xargs Requires: %{_bindir}/xargs
# for brp-llvm-compile-lto-elf
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
@ -250,9 +254,37 @@ install -p -m 644 -t %{buildroot}%{_rpmluadir}/fedora/srpm forge.lua
%doc buildflags.md %doc buildflags.md
%changelog %changelog
* Tue May 09 2023 Eduard Abdullin <eabdullin@almalinux.org> - 199-1.alma * Thu Mar 28 2024 Eduard Abdullin <eabdullin@almalinux.org> - 207-1.alma.1
- 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
- Add llvm dependency if clang toolchain used
- Resolves: rhbz#2193406
* Wed Apr 19 2023 Nikita Popov <npopov@redhat.com> - 200-1
- Change clang LTO default to ThinLTO
- Resolves: rhbz#2178788
* Mon Feb 13 2023 Miro Hrončok <mhroncok@redhat.com> - 199-1 * Mon Feb 13 2023 Miro Hrončok <mhroncok@redhat.com> - 199-1
- Add pyproject-srpm-macros to the default buildroot - Add pyproject-srpm-macros to the default buildroot
- Related: rhbz#2168193 - Related: rhbz#2168193