CVS commit: pkgsrc/devel/cmocka

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Mon Jun 15 19:04:11 UTC 2026

Modified Files:
        pkgsrc/devel/cmocka: distinfo
Added Files:
        pkgsrc/devel/cmocka/patches: patch-include_cmocka.h

Log Message:
devel/cmocka: Don't use newfangled attribute access on gcc < 12

The usage is guarded on __has_attribute(access), but that apparently
doesn't distinguish having access none.  Fix inspired by an upstream
bug report (which has a huge hex string intstead of a number in the
brave new world of gitlab), avoid attribute access on gcc <= 12.

Upstream has not acted on or commented on the bug report, file on
April 10.

Resolves failure to build on NetBSD 10, probably resolves problems on
other gcc 10 hosts, and shouldn't affect systems with gcc >= 12.


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/cmocka/distinfo
cvs rdiff -u -r0 -r1.5 pkgsrc/devel/cmocka/patches/patch-include_cmocka.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/cmocka/distinfo
diff -u pkgsrc/devel/cmocka/distinfo:1.14 pkgsrc/devel/cmocka/distinfo:1.15
--- pkgsrc/devel/cmocka/distinfo:1.14   Thu Jun 11 07:20:58 2026
+++ pkgsrc/devel/cmocka/distinfo        Mon Jun 15 19:04:10 2026
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.14 2026/06/11 07:20:58 wiz Exp $
+$NetBSD: distinfo,v 1.15 2026/06/15 19:04:10 gdt Exp $
 
 BLAKE2s (cmocka-2.0.2.tar.xz) = 8e8d3539ead9c0debd8091421589b33e6a731178026cc46eb5f282a762f18638
 SHA512 (cmocka-2.0.2.tar.xz) = d02d65f0881f18f30b9e46c325acfa349261339daa2c1bf3a4e6360976f13b31588e997415197220f6def156f77d9864994d4e3cfd09c8f16a8594d0a4789a16
 Size (cmocka-2.0.2.tar.xz) = 121144 bytes
+SHA1 (patch-include_cmocka.h) = 71df53d3bbd2cf709a46cc533b0ebf2745244f80

Added files:

Index: pkgsrc/devel/cmocka/patches/patch-include_cmocka.h
diff -u /dev/null pkgsrc/devel/cmocka/patches/patch-include_cmocka.h:1.5
--- /dev/null   Mon Jun 15 19:04:11 2026
+++ pkgsrc/devel/cmocka/patches/patch-include_cmocka.h  Mon Jun 15 19:04:11 2026
@@ -0,0 +1,18 @@
+$NetBSD: patch-include_cmocka.h,v 1.5 2026/06/15 19:04:11 gdt Exp $
+
+Do not use __attribute__ access on gcc < 12, per upstream bug report,
+accessible by the awesome new gitlab URL syntax below:
+
+https://gitlab.com/cmocka/cmocka/-/work_items?show=eyJpaWQiOiIxMTUiLCJmdWxsX3BhdGgiOiJjbW9ja2EvY21vY2thIiwiaWQiOjE4ODEyODQ4Mn0%3D  
+
+--- include/cmocka.h.orig      2026-06-15 18:50:53.821237385 +0000
++++ include/cmocka.h
+@@ -251,7 +251,7 @@ extern "C" {
+  * https://gcc.gnu.org/onlinedocs/gcc-12.2.0/gcc/Common-Function-Attributes.html#Common-Function-Attributes
+  */
+ #ifdef __has_attribute
+-#if __has_attribute(access)
++#if __has_attribute(access) && (!__GNUC__ || __GNUC__ >= 12)
+ #define CMOCKA_NO_ACCESS_ATTRIBUTE \
+     __attribute__((access(none, 1), access(none, 2)))
+ #endif