From 55046a0afb74d71655cbb4120c6221ee03640717 Mon Sep 17 00:00:00 2001
From: Tie Liu <liutie4@huawei.com>
Date: Tue, 22 Aug 2023 21:44:59 +0800
Subject: [PATCH] fix some issues for relocation

---
 glibc.spec | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/glibc.spec b/glibc.spec
index d64d155..a689b87 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -67,7 +67,7 @@
 ##############################################################################
 Name: 	 	glibc
 Version: 	2.38
-Release: 	4
+Release: 	5
 Summary: 	The GNU libc libraries
 License:	%{all_license}
 URL: 		http://www.gnu.org/software/glibc/
@@ -495,9 +495,6 @@ pushd $builddir
 	{ cat config.log; false; }
 
 make %{?_smp_mflags} -O -r %{glibc_make_flags}
-%if %{ENABLE_RELOC}
-objreloc libc.so.6
-%endif
 popd
 
 ##############################################################################
@@ -691,11 +688,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
@@ -876,6 +868,14 @@ echo "%{_prefix}/libexec/glibc-benchtests/validate_benchout.py*" >> benchtests.f
 	echo "%{_libdir}/libpthread_nonshared.a" >> compat-2.17.filelist
 %endif
 
+%if %{ENABLE_RELOC}
+pushd build-%{target}
+objreloc libc.so.6
+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}
+popd
+%endif
+
 reliantlib=""
 
 function findReliantLib()
@@ -1291,12 +1291,13 @@ fi
 
 %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
 
 %changelog
+* Mon Aug 28 2023 liutie<liutie4@huawei.com> - 2.38-5
+- fix issues about glibc-devel have libc.so.6.relocation
+
 * Wed Aug 16 2023 chenhaixiang<chenhaixiang3@huawei.com> - 2.38-4
 - skipping test case building to fix glibc build error on x86
 
-- 
Gitee