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

!474 upgrade to glibc 2.36

Browse Source 
From: @liqingqing_1229 
Reviewed-by: @wswsamao 
Signed-off-by: @wswsamao
This commit is contained in:
openeuler-ci-bot 2022-08-02 08:51:40 +00:00 committed by Gitee
commit 4cadcf76e2
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
5 changed files with 33 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
delete-no-hard-link-to-avoid-all_language-package-to.patch
View File

@ -1,26 +0,0 @@
From ba6891f0633d394a59d14f0a54090fa1b6260c16 Mon Sep 17 00:00:00 2001
From: buque <wuxu.wu@hotmail.com>
Date: Wed, 15 Jul 2020 15:09:54 +0800
Subject: [PATCH] delete --no-hard-link to avoid all_language package too
large.
---
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/localedata/Makefile b/localedata/Makefile
index b8a3b67..c78d0fe 100644
--- a/localedata/Makefile
+++ b/localedata/Makefile
@@ -444,7 +444,7 @@ $(INSTALL-SUPPORTED-LOCALE-ARCHIVE): install-locales-dir
$(build-one-locale)
$(INSTALL-SUPPORTED-LOCALE-FILES): install-locales-dir
- @flags="-c --no-archive --no-hard-links"; \
+ @flags="-c --no-archive"; \
$(build-one-locale)
tst-setlocale-ENV = LC_ALL=ja_JP.EUC-JP
--
2.25.1

36
elf-Fix-compile-error-with-Werror-and-DNDEBUG.patch
View File

@ -1,36 +0,0 @@
From 5e89ed42fd8997414732525c9460878d65363b3f Mon Sep 17 00:00:00 2001
From: Yang Yanchao <yangyanchao6@huawei.com>
Date: Fri, 15 Apr 2022 17:25:05 +0800
Subject: [PATCH] elf: Fix compile error with -Werror and -DNDEBUG
Using -Werror and -DNDEBUG at the same time will trigger the
following compiler error:
cache.c: In function 'save_cache':
cache.c:758:15: error: unused variable 'old_offset' [-Werror=unused-variable]
758 | off64_t old_offset = lseek64 (fd, extension_offset, SEEK_SET);
| ^~~~~~~~~~
-DNDEBUG disables the assertion, making old_offset unused.
Use __attribute__ ((unused)) to disable this warning.
---
elf/cache.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/elf/cache.c b/elf/cache.c
index abe2e49..3d7d3a6 100644
--- a/elf/cache.c
+++ b/elf/cache.c
@@ -727,7 +727,8 @@ save_cache (const char *cache_name)
if (opt_format != opt_format_old)
{
/* Align file position to 4. */
- off64_t old_offset = lseek64 (fd, extension_offset, SEEK_SET);
+ __attribute__ ((unused)) off64_t old_offset
+ = lseek64 (fd, extension_offset, SEEK_SET);
assert ((unsigned long long int) (extension_offset - old_offset) < 4);
write_extensions (fd, str_offset, extension_offset);
}
--
1.8.3.1

BIN
glibc-2.35.tar.xz → glibc-2.36.tar.xz
View File

Binary file not shown.

12
glibc.spec
View File

@ -64,8 +64,8 @@
# glibc - The GNU C Library (glibc) core package.
##############################################################################
Name: glibc
Version: 2.35
Release: 16
Version: 2.36
Release: 1
Summary: The GNU libc libraries
License: %{all_license}
URL: http://www.gnu.org/software/glibc/
@ -84,10 +84,9 @@ Source8: testsuite_whitelist.%{_target_cpu}
%endif
Patch0: glibc-1070416.patch
Patch1: elf-Fix-compile-error-with-Werror-and-DNDEBUG.patch
#Patch9000: turn-default-value-of-x86_rep_stosb_threshold_form_2K_to_1M.patch
#Patch9001: delete-no-hard-link-to-avoid-all_language-package-to.patch
Patch9000: turn-default-value-of-x86_rep_stosb_threshold_form_2K_to_1M.patch
Patch9001: locale-delete-no-hard-link-to-avoid-all_language-pac.patch
#Patch9002: 0001-add-base-files-for-libphtread-condition-family.patch
#Patch9003: 0002-add-header-files-for-libphtread_2_17_so.patch
#Patch9004: 0003-add-build-script-and-files-of-libpthread_2_17_so.patch
@ -1258,6 +1257,9 @@ fi
%endif
%changelog
* Tue Aug 2 2022 Qingqing Li <liqingqing3@huawei.com> - 2.36-1
- upgrade to 2.36
* Thu Jul 28 2022 Qingqing Li <liqingqing3@huawei.com> - 2.35-16
- optimize Obsoletes version

26
locale-delete-no-hard-link-to-avoid-all_language-pac.patch Normal file
View File

@ -0,0 +1,26 @@
From 6b462949b0cb8265c44c2f9ddbc0758af2279345 Mon Sep 17 00:00:00 2001
From: liqingqing_1229 <liqingqing3@huawei.com>
Date: Tue, 2 Aug 2022 15:10:32 +0800
Subject: [PATCH] locale: delete --no-hard-link to avoid all_language packages
too large
---
localedata/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/localedata/Makefile b/localedata/Makefile
index da92b67..eb4c3d8 100644
--- a/localedata/Makefile
+++ b/localedata/Makefile
@@ -476,7 +476,7 @@ $(INSTALL-SUPPORTED-LOCALE-ARCHIVE): install-locales-dir
$(build-one-locale)
$(INSTALL-SUPPORTED-LOCALE-FILES): install-locales-dir
- @flags="--no-archive --no-hard-links"; \
+ @flags="--no-archive"; \
$(build-one-locale)
tst-setlocale-ENV = LC_ALL=ja_JP.EUC-JP
--
1.8.3.1