[pkgsrc/trunk]: pkgsrc/devel/gtexinfo Redefine nonnull attribute to nothing t...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b8f280f6c787
branches:  trunk
changeset: 770852:b8f280f6c787
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Dec 10 13:55:31 2021 +0000

description:
Redefine nonnull attribute to nothing to avoid build errors with glibc
2.34. It's not that useful anyway.

diffstat:

 devel/gtexinfo/distinfo                                            |   3 +-
 devel/gtexinfo/patches/patch-gnulib_lib_malloc_dynarray-skeleton.c |  17 ++++++++++
 2 files changed, 19 insertions(+), 1 deletions(-)

diffs (37 lines):

diff -r 067544db44ff -r b8f280f6c787 devel/gtexinfo/distinfo
--- a/devel/gtexinfo/distinfo   Fri Dec 10 13:29:24 2021 +0000
+++ b/devel/gtexinfo/distinfo   Fri Dec 10 13:55:31 2021 +0000
@@ -1,10 +1,11 @@
-$NetBSD: distinfo,v 1.58 2021/10/26 10:14:49 nia Exp $
+$NetBSD: distinfo,v 1.59 2021/12/10 13:55:31 joerg Exp $
 
 BLAKE2s (texinfo-6.8.tar.gz) = d91cbc8ac03224da8a4786583ed559b0a2a1a3aa7ea310132abea1a283630f30
 SHA512 (texinfo-6.8.tar.gz) = f46dfb1c0f324a9c54959a8f256f0dcb8aaa59caccb0f027a5ee39a173b6e51a31a488f9d787707e7aa8401a439b2a01a1f3022dbae24ef377a1c021c1ebeb37
 Size (texinfo-6.8.tar.gz) = 10119420 bytes
 SHA1 (patch-ab) = c27f30eefc28f021835f118543e872089b1c3c52
 SHA1 (patch-ac) = 7f7226ee521fddba9f967be4fe199f6bedcfa148
+SHA1 (patch-gnulib_lib_malloc_dynarray-skeleton.c) = 6e683e689bfc7573bf9d62d2bc9a1abb64d521df
 SHA1 (patch-gnulib_lib_mbiter.h) = 34c291e6994c6eb51aba803f3ebf5f09d46e9bdd
 SHA1 (patch-gnulib_lib_mbuiter.h) = be293674c37cb91746527be07aa40acbd285d2f4
 SHA1 (patch-util_texi2dvi) = 72be61e607a393edf0cbd67747f7e0b360441466
diff -r 067544db44ff -r b8f280f6c787 devel/gtexinfo/patches/patch-gnulib_lib_malloc_dynarray-skeleton.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/gtexinfo/patches/patch-gnulib_lib_malloc_dynarray-skeleton.c        Fri Dec 10 13:55:31 2021 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-gnulib_lib_malloc_dynarray-skeleton.c,v 1.1 2021/12/10 13:55:31 joerg Exp $
+
+Macro conflicts with glibc 2.34.
+
+--- gnulib/lib/malloc/dynarray-skeleton.c.orig 2021-12-10 13:51:47.386493429 +0000
++++ gnulib/lib/malloc/dynarray-skeleton.c
+@@ -103,6 +103,10 @@
+ # error "DYNARRAY_PREFIX must be defined"
+ #endif
+ 
++#undef __attribute_nonnull__
++#define __attribute_nonnull__(x)
++
++
+ #ifdef DYNARRAY_INITIAL_SIZE
+ # if DYNARRAY_INITIAL_SIZE < 0
+ #  error "DYNARRAY_INITIAL_SIZE must be non-negative"