rpms/glibc
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Prepare for integration of GCC 8 compatible _Static_assert (#2149102)

Browse Source 
Resolves: #2149102
This commit is contained in:
Florian Weimer 2022-11-29 10:12:10 +01:00
parent e53a4d9db1
commit 3f0e13124e
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
glibc-rh2149102.patch Normal file
View File

@ -0,0 +1,19 @@
commit b8c6166b1b75036ab3e4127a1c0aacf52ca93651
Author: Florian Weimer <fweimer@redhat.com>
Date: Mon Sep 6 19:43:37 2021 +0200
locale: Add missing second argument to _Static_assert in C-collate-seq.c
diff --git a/locale/C-collate-seq.c b/locale/C-collate-seq.c
index 4fb82cb8357936b6..40b17f4f90313144 100644
--- a/locale/C-collate-seq.c
+++ b/locale/C-collate-seq.c
@@ -55,7 +55,7 @@ static const char collseqmb[] =
/* This table must be 256 bytes in size. We index bytes into the
table to find the collation sequence. */
-_Static_assert (sizeof (collseqmb) == 256);
+_Static_assert (sizeof (collseqmb) == 256, "sizeof (collseqmb)");
static const uint32_t collseqwc[] =
{

6
glibc.spec
View File

@ -148,7 +148,7 @@ end \
Summary: The GNU libc libraries
Name: glibc
Version: %{glibcversion}
Release: 50%{?dist}
Release: 51%{?dist}
# In general, GPLv2+ is used by programs, LGPLv2+ is used for
# libraries.
@ -654,6 +654,7 @@ Patch442: glibc-upstream-2.34-362.patch
Patch443: glibc-upstream-2.34-363.patch
Patch444: glibc-upstream-2.34-364.patch
Patch445: glibc-upstream-2.34-365.patch
Patch446: glibc-rh2149102.patch
##############################################################################
# Continued list of core "glibc" package information:
@ -2710,6 +2711,9 @@ fi
%files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared
%changelog
* Tue Nov 29 2022 Florian Weimer <fweimer@redhat.com> - 2.34-51
- Prepare for integration of GCC 8 compatible _Static_assert (#2149102)
* Fri Nov 25 2022 Arjun Shankar <arjun@redhat.com> - 2.34-50
- Sync with upstream branch release/2.34/master,
commit 405b8ae13540e9fd614df614e3361ebf9abd14cf: