packages/glibc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

skipping test case building to fix glibc build error on x86

Browse Source 
Signed-off-by:chenhaixiang3@huawei.com
This commit is contained in:
chenhaixiang 2023-08-16 03:53:37 -04:00
parent 53eb4e9b41
commit ce221e90ce
2 changed files with 61 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
0001-fix-glibc-build-error-on-x86.patch Normal file
View File

@ -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

6
glibc.spec
View File

@ -65,7 +65,7 @@
##############################################################################
Name: glibc
Version: 2.38
Release: 3
Release: 4
Summary: The GNU libc libraries
License: %{all_license}
URL: http://www.gnu.org/software/glibc/
@ -105,6 +105,7 @@ Patch9016: add-GB18030-2022-charmap-BZ-30243.patch
Patch9017: 0001-Optimizing-__random-for-single-threaded-scenarios.patch
Patch9018: fix-Segmentation-fault-in-nss-module.patch
Patch9019: fix_nss_database_check_reload_and_get_memleak.patch
Patch9020: 0001-fix-glibc-build-error-on-x86.patch
Provides: ldconfig rtld(GNU_HASH) bundled(gnulib)
@ -1264,6 +1265,9 @@ fi
%endif
%changelog
* Wed Aug 16 2023 chenhaixiang<chenhaixiang3@huawei.com> - 2.38-4
- skipping test case building to fix glibc build error on x86
* Mon Aug 7 2023 zhanghao<zhanghao383@huawei.com> - 2.38-3
- fix Segmentation fault in nss module
- fix nss database check reload and get memleak