开源软件构建与测试

Changes of Revision 2

_service:tar_scm:glibc.spec Changed

@@ -48,7 +48,7 @@
 %undefine with_valgrind
 %endif
 
-%global ENABLE_RELOC 1
+%global ENABLE_RELOC 0
 
 # Only some architectures have static PIE support
 %define pie_arches %{ix86} x86_64 aarch64
@@ -67,7 +67,7 @@
 ##############################################################################
 Name: 	 	glibc
 Version: 	2.38
-Release: 	3
+Release: 	8
 Summary: 	The GNU libc libraries
 License:	%{all_license}
 URL: 		http://www.gnu.org/software/glibc/
@@ -109,6 +109,7 @@
 %if %{ENABLE_RELOC}
 Patch9018: reserve-relocation-information-for-sysboost.patch
 %endif
+Patch9019: 0001-fix-glibc-build-error-on-x86.patch
 
 Provides: ldconfig rtld(GNU_HASH) bundled(gnulib)
 
@@ -494,9 +495,6 @@
 	{ cat config.log; false; }
 
 make %{?_smp_mflags} -O -r %{glibc_make_flags}
-%if %{ENABLE_RELOC}
-objreloc libc.so.6
-%endif
 popd
 
 ##############################################################################
@@ -690,11 +688,6 @@
       -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
@@ -875,6 +868,14 @@
 	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()
@@ -1290,12 +1291,25 @@
 
 %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
+* Thu Sep 14 2023 yangpan<yangpan51@huawei.com> - 2.38-8
+- disable sysboost
+
+* Tue Sep 12 2023 yangpan<yangpan51@huawei.com> - 2.38-7
+- revert fix issues about not stripped
+
+* Mon Sep 11 2023 yangpan<yangpan51@huawei.com> - 2.38-6
+- fix issues about not stripped
+
+* 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
+
 * Fri Aug 4 2023 longwei<longwei27@huawei.com> - 2.38-3
 - add libc.so relocation file for sysboost

_service:tar_scm:0001-fix-glibc-build-error-on-x86.patch Added

@@ -0,0 +1,56 @@
+From a2150b0d854b6ce3100d7823e3e48b2710161bfc Mon Sep 17 00:00:00 2001
+From: chenhaixiang <chenhaixiang3@huawei.com>
+Date: Wed, 16 Aug 2023 15:47:44 +0800
+Subject: PATCH skipping test case building fix glibc build error on x86
+
+Due to the upgrade of binutils to version 2.40,
+support for the -z pack-relative-relocs 
+compilation option was added during glibc building.
+This caused the linking failure of the test cases
+tst-protected1a, tst-protected1b, and vismain.
+These files are only compiled when have-protected-data
+ is set to 'yes'.
+To ensure the successful building of glibc, these files are temporarily skipped.
+
+---
+ elf/Makefile | 19 -------------------
+ 1 file changed, 19 deletions(-)
+
+diff --git a/elf/Makefile b/elf/Makefile
+index c00e2ccf..8cd01845 100644
+--- a/elf/Makefile
++++ b/elf/Makefile
+@@ -986,30 +986,11 @@ tst-gnu2-tls1mod.so-no-z-defs = yes
+ CFLAGS-tst-gnu2-tls1mod.c += -mtls-dialect=gnu2
+ endif # $(have-mtls-dialect-gnu2)
+ 
+-ifeq (yes,$(have-protected-data))
+-modules-names += tst-protected1moda tst-protected1modb
+-tests += tst-protected1a tst-protected1b
+-$(objpfx)tst-protected1a: $(addprefix $(objpfx),tst-protected1moda.so tst-protected1modb.so)
+-$(objpfx)tst-protected1b: $(addprefix $(objpfx),tst-protected1modb.so tst-protected1moda.so)
+-tst-protected1modb.so-no-z-defs = yes
+-# These tests fail with GCC versions prior to 5.1 and with some versions
+-# of binutils.  See https://sourceware.org/bugzilla/show_bug.cgi?id=17709
+-# and https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65248 for details.
+-# Perhaps in future we can make these XFAILs conditional on some detection
+-# of compiler/linker behavior/version.
+-test-xfail-tst-protected1a = yes
+-test-xfail-tst-protected1b = yes
+-endif
+ ifeq (yesyes,$(have-fpie)$(build-shared))
+ modules-names += tst-piemod1
+ tests += tst-pie1 tst-pie2 tst-dlopen-pie tst-dlopen-tlsmodid-pie \
+   tst-dlopen-self-pie
+ tests-pie += tst-pie1 tst-pie2 tst-dlopen-tlsmodid-pie tst-dlopen-self-pie
+-ifeq (yes,$(have-protected-data))
+-tests += vismain
+-tests-pie += vismain
+-CFLAGS-vismain.c += $(PIE-ccflag)
+-endif
+ endif
+ modules-execstack-yes = tst-execstack-mod
+ extra-test-objs += $(addsuffix .os,$(strip $(modules-names)))
+-- 
+2.41.0
+