CVS commit: pkgsrc/devel/m4

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Mon Apr 28 17:24:43 UTC 2025

Modified Files:
        pkgsrc/devel/m4: distinfo
Added Files:
        pkgsrc/devel/m4/patches: patch-lib_gl__list.h patch-lib_gl__oset.h

Log Message:
m4: fix build w/ GCC 15


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 pkgsrc/devel/m4/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/m4/patches/patch-lib_gl__list.h \
    pkgsrc/devel/m4/patches/patch-lib_gl__oset.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/m4/distinfo
diff -u pkgsrc/devel/m4/distinfo:1.54 pkgsrc/devel/m4/distinfo:1.55
--- pkgsrc/devel/m4/distinfo:1.54       Tue Feb 18 15:07:14 2025
+++ pkgsrc/devel/m4/distinfo    Mon Apr 28 17:24:43 2025
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.54 2025/02/18 15:07:14 wiz Exp $
+$NetBSD: distinfo,v 1.55 2025/04/28 17:24:43 tnn Exp $
 
 BLAKE2s (m4-1.4.19.tar.gz) = f1380114d839935b2afa53fdd7162dc5df2bbeb6d5eab48528916a138f483cbc
 SHA512 (m4-1.4.19.tar.gz) = f5dd0f02fcae65a176a16af9a8e1747c26e9440c6c224003ba458d3298b777a75ffb189aee9051fb0c4840b2a48278be4a51d959381af0b1d627570f478c58f2
 Size (m4-1.4.19.tar.gz) = 2953876 bytes
 SHA1 (patch-configure) = 941bba8b1a10c3fc305d20abdb247cf45e44d534
+SHA1 (patch-lib_gl__list.h) = cf0b6776d3c7b758dc10387232df48cd37942616
+SHA1 (patch-lib_gl__oset.h) = 69fa55daea013dc4835411dbe43516408806259b
 SHA1 (patch-lib_sigsegv.c) = 5f49ac75d55aae5a5ad5530a212ec25e15c679e8
 SHA1 (patch-lib_strerror_override.c) = 29905fecf6c92f75c4999f1e3cb56e14fe2f4aae
 SHA1 (patch-m4_sparcv8+.m4) = 761e592a700ea47ac0ba15d960f073115005dedd

Added files:

Index: pkgsrc/devel/m4/patches/patch-lib_gl__list.h
diff -u /dev/null pkgsrc/devel/m4/patches/patch-lib_gl__list.h:1.1
--- /dev/null   Mon Apr 28 17:24:43 2025
+++ pkgsrc/devel/m4/patches/patch-lib_gl__list.h        Mon Apr 28 17:24:43 2025
@@ -0,0 +1,90 @@
+$NetBSD: patch-lib_gl__list.h,v 1.1 2025/04/28 17:24:43 tnn Exp $
+
+Move [[__nodiscard__]] to beginning of row.
+Required for C23.
+
+--- lib/gl_list.h.orig 2025-04-28 17:20:07.433022820 +0000
++++ lib/gl_list.h
+@@ -630,7 +630,7 @@ gl_list_node_value (gl_list_t list, gl_l
+          ->node_value (list, node);
+ }
+ 
+-GL_LIST_INLINE _GL_ATTRIBUTE_NODISCARD int
++_GL_ATTRIBUTE_NODISCARD GL_LIST_INLINE int
+ gl_list_node_nx_set_value (gl_list_t list, gl_list_node_t node,
+                            const void *elt)
+ {
+@@ -685,20 +685,20 @@ gl_list_get_last (gl_list_t list)
+   return gl_list_get_at (list, gl_list_size (list) - 1);
+ }
+ 
+-GL_LIST_INLINE _GL_ATTRIBUTE_NODISCARD gl_list_node_t
++_GL_ATTRIBUTE_NODISCARD GL_LIST_INLINE gl_list_node_t
+ gl_list_nx_set_at (gl_list_t list, size_t position, const void *elt)
+ {
+   return ((const struct gl_list_impl_base *) list)->vtable
+          ->nx_set_at (list, position, elt);
+ }
+ 
+-GL_LIST_INLINE _GL_ATTRIBUTE_NODISCARD gl_list_node_t
++_GL_ATTRIBUTE_NODISCARD GL_LIST_INLINE gl_list_node_t
+ gl_list_nx_set_first (gl_list_t list, const void *elt)
+ {
+   return gl_list_nx_set_at (list, 0, elt);
+ }
+ 
+-GL_LIST_INLINE _GL_ATTRIBUTE_NODISCARD gl_list_node_t
++_GL_ATTRIBUTE_NODISCARD GL_LIST_INLINE gl_list_node_t
+ gl_list_nx_set_last (gl_list_t list, const void *elt)
+ {
+   return gl_list_nx_set_at (list, gl_list_size (list) - 1, elt);
+@@ -752,35 +752,35 @@ gl_list_indexof_from_to (gl_list_t list,
+          ->indexof_from_to (list, start_index, end_index, elt);
+ }
+ 
+-GL_LIST_INLINE _GL_ATTRIBUTE_NODISCARD gl_list_node_t
++_GL_ATTRIBUTE_NODISCARD GL_LIST_INLINE gl_list_node_t
+ gl_list_nx_add_first (gl_list_t list, const void *elt)
+ {
+   return ((const struct gl_list_impl_base *) list)->vtable
+          ->nx_add_first (list, elt);
+ }
+ 
+-GL_LIST_INLINE _GL_ATTRIBUTE_NODISCARD gl_list_node_t
++_GL_ATTRIBUTE_NODISCARD GL_LIST_INLINE gl_list_node_t
+ gl_list_nx_add_last (gl_list_t list, const void *elt)
+ {
+   return ((const struct gl_list_impl_base *) list)->vtable
+          ->nx_add_last (list, elt);
+ }
+ 
+-GL_LIST_INLINE _GL_ATTRIBUTE_NODISCARD gl_list_node_t
++_GL_ATTRIBUTE_NODISCARD GL_LIST_INLINE gl_list_node_t
+ gl_list_nx_add_before (gl_list_t list, gl_list_node_t node, const void *elt)
+ {
+   return ((const struct gl_list_impl_base *) list)->vtable
+          ->nx_add_before (list, node, elt);
+ }
+ 
+-GL_LIST_INLINE _GL_ATTRIBUTE_NODISCARD gl_list_node_t
++_GL_ATTRIBUTE_NODISCARD GL_LIST_INLINE gl_list_node_t
+ gl_list_nx_add_after (gl_list_t list, gl_list_node_t node, const void *elt)
+ {
+   return ((const struct gl_list_impl_base *) list)->vtable
+          ->nx_add_after (list, node, elt);
+ }
+ 
+-GL_LIST_INLINE _GL_ATTRIBUTE_NODISCARD gl_list_node_t
++_GL_ATTRIBUTE_NODISCARD GL_LIST_INLINE gl_list_node_t
+ gl_list_nx_add_at (gl_list_t list, size_t position, const void *elt)
+ {
+   return ((const struct gl_list_impl_base *) list)->vtable
+@@ -891,7 +891,7 @@ gl_sortedlist_indexof_from_to (gl_list_t
+                                        elt);
+ }
+ 
+-GL_LIST_INLINE _GL_ATTRIBUTE_NODISCARD gl_list_node_t
++_GL_ATTRIBUTE_NODISCARD GL_LIST_INLINE gl_list_node_t
+ gl_sortedlist_nx_add (gl_list_t list, gl_listelement_compar_fn compar, const void *elt)
+ {
+   return ((const struct gl_list_impl_base *) list)->vtable
Index: pkgsrc/devel/m4/patches/patch-lib_gl__oset.h
diff -u /dev/null pkgsrc/devel/m4/patches/patch-lib_gl__oset.h:1.1
--- /dev/null   Mon Apr 28 17:24:43 2025
+++ pkgsrc/devel/m4/patches/patch-lib_gl__oset.h        Mon Apr 28 17:24:43 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-lib_gl__oset.h,v 1.1 2025/04/28 17:24:43 tnn Exp $
+
+Move [[__nodiscard__]] to beginning of row.
+Required for C23.
+
+--- lib/gl_oset.h.orig 2025-04-28 17:19:25.736258687 +0000
++++ lib/gl_oset.h
+@@ -272,7 +272,7 @@ gl_oset_search_atleast (gl_oset_t set,
+          ->search_atleast (set, threshold_fn, threshold, eltp);
+ }
+ 
+-GL_OSET_INLINE _GL_ATTRIBUTE_NODISCARD int
++_GL_ATTRIBUTE_NODISCARD GL_OSET_INLINE int
+ gl_oset_nx_add (gl_oset_t set, const void *elt)
+ {
+   return ((const struct gl_oset_impl_base *) set)->vtable->nx_add (set, elt);