rpms/glibc
7
0
Fork 2
Code Issues Pull Requests Releases Activity

Do not generate ELF dependency information for glibc32

Browse Source 
(cherry picked from commit 01911dc70e30a96d5a7835475187ff6241a68a2d)
This commit is contained in:
Florian Weimer 2024-03-15 08:44:46 +01:00
parent fc720e6194
commit 1470fe1da7
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
glibc.spec
View File

@ -171,7 +171,7 @@ Version: %{glibcversion}
# - It allows using the Release number without the %%dist tag in the dependency # - It allows using the Release number without the %%dist tag in the dependency
# generator to make the generated requires interchangeable between Rawhide # generator to make the generated requires interchangeable between Rawhide
# and ELN (.elnYY < .fcXX). # and ELN (.elnYY < .fcXX).
%global baserelease 5 %global baserelease 6
Release: %{baserelease}%{?dist} Release: %{baserelease}%{?dist}
# Licenses: # Licenses:
@ -1094,6 +1094,11 @@ that can be installed across architectures.
%package -n glibc32 %package -n glibc32
Summary: The GNU libc libraries (32-bit) Summary: The GNU libc libraries (32-bit)
Conflicts: glibc(x86-32) Conflicts: glibc(x86-32)
%dnl The gcc package does not use ELF dependencies to install glibc32:
%dnl BuildRequires: (glibc32 or glibc-devel(%{__isa_name}-32))
%dnl Not generating the ELF dependencies for glibc32 makes it less likely
%dnl that the package is selected by accident over glibc.i686.
AutoReqProv: no
%description -n glibc32 %description -n glibc32
This package is only used for internal building of multilib aware This package is only used for internal building of multilib aware
@ -2459,6 +2464,9 @@ update_gconv_modules_cache ()
%endif %endif
%changelog %changelog
* Tue Mar 26 2024 Florian Weimer <fweimer@redhat.com> - 2.39-6
- Do not generate ELF dependency information for glibc32
* Tue Mar 26 2024 Joseph Myers <josmyers@redhat.com> - 2.39-5 * Tue Mar 26 2024 Joseph Myers <josmyers@redhat.com> - 2.39-5
- Build glibc32 binary package from glibc sources as part of x86_64 build, - Build glibc32 binary package from glibc sources as part of x86_64 build,
not from glibc32 SRPM that contains binaries from i686 RPM build. not from glibc32 SRPM that contains binaries from i686 RPM build.