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

fix one patch missing in source rpm package

Browse Source 
Signed-off-by: Ni Cunshu <nicunshu@huawei.com>
(cherry picked from commit 2902834bbaa0e7575e2bbeefb8bc410d1064f09a)
This commit is contained in:
Ni Cunshu 2023-12-05 19:29:07 +08:00 committed by openeuler-sync-bot
parent 73df670b0c
commit cb98108345
2 changed files with 14 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
add-Wl-z-noseparate-code-for-so.patch
View File

@ -13,22 +13,17 @@ https://sourceware.org/pipermail/binutils/2018-February/101950.html
https://reviews.llvmm.org/D64903 https://reviews.llvmm.org/D64903
https://packagehub.suse.com/packages/binutils/2_37-1050100_7_34_1/ https://packagehub.suse.com/packages/binutils/2_37-1050100_7_34_1/
--- ---
Makeconfig | 2 +- sysdeps/x86_64/Makeconfig | 1 +
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+)
create mode 100644 sysdeps/x86_64/Makeconfig
diff --git a/Makeconfig b/Makeconfig diff --git a/sysdeps/x86_64/Makeconfig b/sysdeps/x86_64/Makeconfig
index 92e76d62..28cea3de 100644 new file mode 100644
--- a/Makeconfig index 00000000..5f544fd7
+++ b/Makeconfig --- /dev/null
@@ -366,7 +366,7 @@ LDFLAGS.so += $(combreloc-LDFLAGS) +++ b/sysdeps/x86_64/Makeconfig
LDFLAGS-rtld += $(combreloc-LDFLAGS) @@ -0,0 +1 @@
endif
-relro-LDFLAGS = -Wl,-z,relro
+relro-LDFLAGS = -Wl,-z,relro -Wl,-z,noseparate-code +relro-LDFLAGS = -Wl,-z,relro -Wl,-z,noseparate-code
LDFLAGS.so += $(relro-LDFLAGS)
LDFLAGS-rtld += $(relro-LDFLAGS)
-- --
2.27.0 2.33.0

13
glibc.spec
View File

@ -36,10 +36,6 @@
%bcond_without compat_2_17 %bcond_without compat_2_17
%endif %endif
%ifarch x86_64
%bcond_without noseparate_code
%endif
%ifarch %{valgrind_arches} %ifarch %{valgrind_arches}
%bcond_without valgrind %bcond_without valgrind
%else %else
@ -70,7 +66,7 @@
############################################################################## ##############################################################################
Name: glibc Name: glibc
Version: 2.34 Version: 2.34
Release: 141 Release: 142
Summary: The GNU libc libraries Summary: The GNU libc libraries
License: %{all_license} License: %{all_license}
URL: http://www.gnu.org/software/glibc/ URL: http://www.gnu.org/software/glibc/
@ -328,11 +324,7 @@ Patch9040: elf-ld.so-add-MAP_NORESERVE-flag-for-the-first-mmap-2MB-contig.patch
Patch9041: elf-ld.so-prohibit-multiple-i-options-and-do-not-allow-i-speci.patch Patch9041: elf-ld.so-prohibit-multiple-i-options-and-do-not-allow-i-speci.patch
Patch9042: elf-ld.so-Consider-maybe-existing-hole-between-PT_LO.patch Patch9042: elf-ld.so-Consider-maybe-existing-hole-between-PT_LO.patch
Patch9043: add-GB18030-2022-charmap-BZ-30243.patch Patch9043: add-GB18030-2022-charmap-BZ-30243.patch
%if %{with noseparate_code}
Patch9044: add-Wl-z-noseparate-code-for-so.patch Patch9044: add-Wl-z-noseparate-code-for-so.patch
%endif
Patch9045: fix-Segmentation-fault-in-nss-module.patch Patch9045: fix-Segmentation-fault-in-nss-module.patch
Patch9046: fix_nss_database_check_reload_and_get_memleak.patch Patch9046: fix_nss_database_check_reload_and_get_memleak.patch
Patch9047: inet-fix-warn-unused-result.patch Patch9047: inet-fix-warn-unused-result.patch
@ -1502,6 +1494,9 @@ fi
%endif %endif
%changelog %changelog
* Tue Dec 5 2023 nicunshu <nicunshu@huawei.com> - 2.34-142
- add the missing patch to the source package
* Mon Nov 13 2023 lixing <lixing@loongson.cn> - 2.34-141 * Mon Nov 13 2023 lixing <lixing@loongson.cn> - 2.34-141
- Fixup LoongArch Port errors - Fixup LoongArch Port errors