From 79ca7bcdf217952ec6334a73199f65985888b3ba Mon Sep 17 00:00:00 2001 From: Siddhesh Poyarekar Date: Mon, 8 Sep 2025 21:03:40 -0400 Subject: [PATCH] Fix glibc32 build dependency Harmonize with Fedora and RHEL9 system gcc to make sure it always picks the correct glibc32 from buildroot. Resolves: RHEL-113183 --- gcc-toolset-15-gcc.spec | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gcc-toolset-15-gcc.spec b/gcc-toolset-15-gcc.spec index 76d04cc..cddbe57 100644 --- a/gcc-toolset-15-gcc.spec +++ b/gcc-toolset-15-gcc.spec @@ -172,7 +172,7 @@ BuildRequires: gcc-toolset-%{gts_ver}-devel Summary: GCC version %{gcc_major} Name: %{?scl_prefix}gcc Version: %{gcc_version} -Release: %{gcc_release}.5%{?dist} +Release: %{gcc_release}.6%{?dist} # License notes for some of the less obvious ones: # gcc/doc/cppinternals.texi: Linux-man-pages-copyleft-2-para # isl: MIT, BSD-2-Clause @@ -252,12 +252,10 @@ BuildRequires: libzstd-devel BuildRequires: glibc >= 2.3.90-35 %endif %ifarch %{multilib_64_archs} -# Ensure glibc{,-devel} is installed for both multilib arches -%if 0%{?rhel} < 10 -BuildRequires: /lib/libc.so.6 /usr/lib/libc.so /lib64/libc.so.6 /usr/lib64/libc.so -%else -BuildRequires: /usr/lib/libc.so /usr/lib64/libc.so +BuildRequires: (glibc32 or glibc-devel(%{__isa_name}-32)) %endif +%ifarch sparcv9 ppc +BuildRequires: (glibc64 or glibc-devel(%{__isa_name}-64)) %endif %ifarch ia64 BuildRequires: libunwind >= 0.98 @@ -2904,6 +2902,9 @@ fi %endif %changelog +* Tue Sep 9 2025 Siddhesh Poyarekar 15.1.1-2.6 +- Fix glibc32 build dependency (RHEL-113183) + * Wed Jul 30 2025 Siddhesh Poyarekar 15.1.1-2.5 - Drop the workaround for CVE-2025-5702 (RHEL-100161)