fix one patch missing in source rpm package
Signed-off-by: Ni Cunshu <nicunshu@huawei.com> (cherry picked from commit 2902834bbaa0e7575e2bbeefb8bc410d1064f09a)
This commit is contained in:
parent
73df670b0c
commit
cb98108345
@ -13,22 +13,17 @@ https://sourceware.org/pipermail/binutils/2018-February/101950.html
|
||||
https://reviews.llvmm.org/D64903
|
||||
https://packagehub.suse.com/packages/binutils/2_37-1050100_7_34_1/
|
||||
---
|
||||
Makeconfig | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
sysdeps/x86_64/Makeconfig | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
create mode 100644 sysdeps/x86_64/Makeconfig
|
||||
|
||||
diff --git a/Makeconfig b/Makeconfig
|
||||
index 92e76d62..28cea3de 100644
|
||||
--- a/Makeconfig
|
||||
+++ b/Makeconfig
|
||||
@@ -366,7 +366,7 @@ LDFLAGS.so += $(combreloc-LDFLAGS)
|
||||
LDFLAGS-rtld += $(combreloc-LDFLAGS)
|
||||
endif
|
||||
|
||||
-relro-LDFLAGS = -Wl,-z,relro
|
||||
diff --git a/sysdeps/x86_64/Makeconfig b/sysdeps/x86_64/Makeconfig
|
||||
new file mode 100644
|
||||
index 00000000..5f544fd7
|
||||
--- /dev/null
|
||||
+++ b/sysdeps/x86_64/Makeconfig
|
||||
@@ -0,0 +1 @@
|
||||
+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
13
glibc.spec
@ -36,10 +36,6 @@
|
||||
%bcond_without compat_2_17
|
||||
%endif
|
||||
|
||||
%ifarch x86_64
|
||||
%bcond_without noseparate_code
|
||||
%endif
|
||||
|
||||
%ifarch %{valgrind_arches}
|
||||
%bcond_without valgrind
|
||||
%else
|
||||
@ -70,7 +66,7 @@
|
||||
##############################################################################
|
||||
Name: glibc
|
||||
Version: 2.34
|
||||
Release: 141
|
||||
Release: 142
|
||||
Summary: The GNU libc libraries
|
||||
License: %{all_license}
|
||||
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
|
||||
Patch9042: elf-ld.so-Consider-maybe-existing-hole-between-PT_LO.patch
|
||||
Patch9043: add-GB18030-2022-charmap-BZ-30243.patch
|
||||
|
||||
%if %{with noseparate_code}
|
||||
Patch9044: add-Wl-z-noseparate-code-for-so.patch
|
||||
%endif
|
||||
|
||||
Patch9045: fix-Segmentation-fault-in-nss-module.patch
|
||||
Patch9046: fix_nss_database_check_reload_and_get_memleak.patch
|
||||
Patch9047: inet-fix-warn-unused-result.patch
|
||||
@ -1502,6 +1494,9 @@ fi
|
||||
%endif
|
||||
|
||||
%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
|
||||
- Fixup LoongArch Port errors
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user