diff --git a/glibc.spec b/glibc.spec index 1fdabe2fb8fa974eeba4081fbc6d213a3ed0fece..3660a2e8251156d1ff3fa7b5f58e9ffd3e0ec00e 100644 --- a/glibc.spec +++ b/glibc.spec @@ -67,7 +67,7 @@ ############################################################################## Name: glibc Version: 2.38 -Release: 45 +Release: 46 Summary: The GNU libc libraries License: %{all_license} URL: http://www.gnu.org/software/glibc/ @@ -262,9 +262,6 @@ Patch9006: fix-Segmentation-fault-in-nss-module.patch Patch9007: fix_nss_database_check_reload_and_get_memleak.patch Patch9008: 0001-fix-glibc-build-error-on-x86.patch -%if %{ENABLE_RELOC} -Patch9009: reserve-relocation-information-for-sysboost.patch -%endif Patch9010: add-Wl-z-noseparate-code-for-so.patch Provides: ldconfig rtld(GNU_HASH) bundled(gnulib) @@ -537,19 +534,6 @@ Currently, provide pthread_condition function. To keep older applications compatible, glibc-compat-2.17 provides libpthread_nonshared.a %endif -%if %{ENABLE_RELOC} -############################################################################## -# glibc reloc sub-package -############################################################################## -%package relocation -Summary: Relocations for %{name} -Requires: %{name} = %{version}-%{release} -BuildRequires: native-turbo-tools - -%description relocation -This package contains relocations for %{name}. -%endif - ############################################################################## # Prepare for the build. ############################################################################## @@ -651,9 +635,6 @@ pushd $builddir { cat config.log; false; } make %{?_smp_mflags} -O -r %{glibc_make_flags} -%if %{ENABLE_RELOC} -objreloc libc.so.6 -%endif popd ############################################################################## @@ -847,11 +828,6 @@ for i in $RPM_BUILD_ROOT%{_prefix}/bin/{xtrace,memusage}; do -i $i done -%if %{ENABLE_RELOC} -mkdir -p ${RPM_BUILD_ROOT}/usr/lib/relocation/%{_libdir} -install -p ${RPM_BUILD_DIR}/%{name}-%{version}/build-%{target}/libc.so.6.relocation ${RPM_BUILD_ROOT}/usr/lib/relocation/%{_libdir} -%endif - touch master.filelist touch glibc.filelist touch common.filelist @@ -1435,13 +1411,6 @@ fi %attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/db/nscd/services %ghost %config(missingok,noreplace) /etc/sysconfig/nscd -%if %{ENABLE_RELOC} -%files relocation -%dir %attr(500, root, root) /usr/lib/relocation -%dir %attr(500, root, root) /usr/lib/relocation/%{_libdir} -%attr(400, root, root) /usr/lib/relocation/%{_libdir}/libc.so.6.relocation -%endif - %files -f nss_modules.filelist -n nss_modules /var/db/Makefile @@ -1471,6 +1440,9 @@ fi %endif %changelog +* Tue Dec 10 2024 shenzhongwei - 2.38-46 +- delete useless patches in the source package. + * Sat Dec 7 2024 Qingqing Li - 2.38-45 - nptl: initialize cpu_id_start prior to rseq registration - nptl: initialize rseq area prior to registration diff --git a/reserve-relocation-information-for-sysboost.patch b/reserve-relocation-information-for-sysboost.patch deleted file mode 100644 index fc1be70d08063c7bed7015f01ed575e3b0a3218e..0000000000000000000000000000000000000000 --- a/reserve-relocation-information-for-sysboost.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b44dbe791e801b4ef40352849b83264e8ad9415b Mon Sep 17 00:00:00 2001 -From: lw -Date: Mon, 21 Aug 2023 15:28:09 +0800 -Subject: [PATCH] reserve relocation information for sysboost - ---- - Makerules | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makerules b/Makerules -index 018780c8..a4603f68 100644 ---- a/Makerules -+++ b/Makerules -@@ -534,7 +534,7 @@ lib%.so: lib%_pic.a $(+preinit) $(+postinit) $(link-libc-deps) - $(call after-link,$@) - - define build-shlib-helper --$(LINK.o) -shared -static-libgcc -Wl,-O1 $(sysdep-LDFLAGS) \ -+$(LINK.o) -shared -static-libgcc -Wl,-O1 $(sysdep-LDFLAGS) -Wl,--emit-relocs \ - $(if $($(@F)-no-z-defs)$(no-z-defs),,-Wl,-z,defs) $(rtld-LDFLAGS) \ - $(if $($(@F)-no-dt-relr),$(no-dt-relr-ldflag),$(dt-relr-ldflag)) \ - $(extra-B-$(@F:lib%.so=%).so) -B$(csu-objpfx) \ --- -2.33.0 -