summaryrefslogtreecommitdiff
path: root/packages/sys-apps/texinfo/files/eb32c992c90617b529e2ce08ad6014d418dceaf9.patch
blob: eaed260803e7c32d4eeebfb5a4c0a8bbd35de50c (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
Source/Upstream: Yes, fixed in gnulib master
Reason: Fix build with glibc 2.34

From eb32c992c90617b529e2ce08ad6014d418dceaf9 Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 22 Apr 2021 12:29:49 -0700
Subject: libc-config: port better to Fedora Rawhide
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Problem reported by Eric Blake in:
https://lists.gnu.org/r/bug-gnulib/2021-04/msg00181.html
* lib/cdefs.h: Make this closer to glibc, so that we can
merge Gnulib into glibc here.
(__attribute_maybe_unused__): Make identical to glibc’s
definition, though with an additional comment.
(__attribute_nonnull__): Add clarifying comment.
Make inclusion of bits/wordsize.h, bits/long-double.h
dependent on __GLIBC__, not on !__WORDSIZE.
* lib/libc-config.h: Use __attribute_nonnull__,
not __attribute_maybe_unused__, to detect whether
to include sys/cdefs.h.
---
 gnulib/lib/libc-config.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/libc-config.h')

diff --git a/gnulib/lib/libc-config.h b/gnulib/lib/libc-config.h
index f14013f7e..f2c86144b 100644
--- a/gnulib/lib/libc-config.h
+++ b/gnulib/lib/libc-config.h
@@ -71,7 +71,7 @@
 # endif
 #endif
 
-#ifndef __attribute_maybe_unused__
+#ifndef __attribute_nonnull__
 /* <sys/cdefs.h> either does not exist, or is too old for Gnulib.
    Prepare to include <cdefs.h>, which is Gnulib's version of a
    more-recent glibc <sys/cdefs.h>.  */
-- 
cgit v1.2.1