summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/sys-apps/texinfo/files/eb32c992c90617b529e2ce08ad6014d418dceaf9.patch45
-rw-r--r--packages/sys-apps/texinfo/texinfo-6.8.exheres-04
2 files changed, 49 insertions, 0 deletions
diff --git a/packages/sys-apps/texinfo/files/eb32c992c90617b529e2ce08ad6014d418dceaf9.patch b/packages/sys-apps/texinfo/files/eb32c992c90617b529e2ce08ad6014d418dceaf9.patch
new file mode 100644
index 000000000..eaed26080
--- /dev/null
+++ b/packages/sys-apps/texinfo/files/eb32c992c90617b529e2ce08ad6014d418dceaf9.patch
@@ -0,0 +1,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
+
diff --git a/packages/sys-apps/texinfo/texinfo-6.8.exheres-0 b/packages/sys-apps/texinfo/texinfo-6.8.exheres-0
index b25692400..36e4ba40f 100644
--- a/packages/sys-apps/texinfo/texinfo-6.8.exheres-0
+++ b/packages/sys-apps/texinfo/texinfo-6.8.exheres-0
@@ -32,6 +32,10 @@ DEPENDENCIES="
dev-perl/Test-Deep [[ note = [ for --enable-tp-tests ] ]]
"
+DEFAULT_SRC_PREPARE_PATCHES=(
+ "${FILES}"/eb32c992c90617b529e2ce08ad6014d418dceaf9.patch
+)
+
DEFAULT_SRC_CONFIGURE_PARAMS=(
--enable-nls
--enable-perl-xs