Add cmocka201, for zimh

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: Add cmocka201, for zimh
From: Olaf Seibert (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Sat, 2 May 2026 12:54:23 +0000
Module Name:	pkgsrc-wip
Committed By:	Olaf Seibert <rhialto%falu.nl@localhost>
Pushed By:	rhialto
Date:		Sat May 2 14:53:53 2026 +0200
Changeset:	e44e842fcdbb288c8517d3027cc43dc40028dd61

Modified Files:
	Makefile
	zimh/Makefile
	zimh/TODO
Added Files:
	cmocka201/DESCR
	cmocka201/Makefile
	cmocka201/PLIST
	cmocka201/PLIST.new
	cmocka201/buildlink3.mk
	cmocka201/distinfo
	cmocka201/patches/patch-CompilerChecks.cmake

Log Message:
Add cmocka201, for zimh

zimh may or may not need it, we'll see.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=e44e842fcdbb288c8517d3027cc43dc40028dd61

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

diffstat:
 Makefile                                     |  1 +
 cmocka201/DESCR                              |  4 ++++
 cmocka201/Makefile                           | 18 ++++++++++++++++
 cmocka201/PLIST                              | 12 +++++++++++
 cmocka201/PLIST.new                          | 12 +++++++++++
 cmocka201/buildlink3.mk                      | 13 +++++++++++
 cmocka201/distinfo                           |  6 ++++++
 cmocka201/patches/patch-CompilerChecks.cmake | 32 ++++++++++++++++++++++++++++
 zimh/Makefile                                |  4 +++-
 zimh/TODO                                    |  5 +++++
 10 files changed, 106 insertions(+), 1 deletion(-)

diffs:
diff --git a/Makefile b/Makefile
index 3006df6ffd..3eb3057ce5 100644
--- a/Makefile
+++ b/Makefile
@@ -553,6 +553,7 @@ SUBDIR+=	clustershell
 SUBDIR+=	cm-unicode-ttf
 SUBDIR+=	cmetrics
 SUBDIR+=	cmoc
+SUBDIR+=	cmocka201
 SUBDIR+=	cockatrice
 SUBDIR+=	cockatrice-server
 SUBDIR+=	cockroach
diff --git a/cmocka201/DESCR b/cmocka201/DESCR
new file mode 100644
index 0000000000..6a138e7859
--- /dev/null
+++ b/cmocka201/DESCR
@@ -0,0 +1,4 @@
+cmocka is an elegant unit testing framework for C with support for
+mock objects. It only requires the standard C library, works on a
+range of computing platforms (including embedded) and with different
+compilers.
diff --git a/cmocka201/Makefile b/cmocka201/Makefile
new file mode 100644
index 0000000000..6cc258d521
--- /dev/null
+++ b/cmocka201/Makefile
@@ -0,0 +1,18 @@
+# $NetBSD$
+
+DISTNAME=	cmocka-2.0.1
+CATEGORIES=	devel
+MASTER_SITES=	https://cmocka.org/files/${PKGVERSION_NOREV:R}/
+EXTRACT_SUFX=	.tar.xz
+
+MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=	https://cmocka.org/
+COMMENT=	Unit testing framework for C supporting mock objects
+LICENSE=	apache-2.0
+
+# GCC 4.3/4.4 provides wrong warnings:
+# cmocka.c:3281: error: 'setup_name' may be used uninitialized in this function
+CMAKE_CONFIGURE_ARGS+=	-DWITH_WERROR_UNINITIALIZED_FLAG=0
+
+.include "../../devel/cmake/build.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/cmocka201/PLIST b/cmocka201/PLIST
new file mode 100644
index 0000000000..689c7381b5
--- /dev/null
+++ b/cmocka201/PLIST
@@ -0,0 +1,12 @@
+@comment $NetBSD$
+include/cmocka.h
+include/cmocka_pbc.h
+include/cmocka_version.h
+lib/cmake/cmocka/cmocka-config-version.cmake
+lib/cmake/cmocka/cmocka-config.cmake
+lib/cmake/cmocka/cmocka-targets-noconfig.cmake
+lib/cmake/cmocka/cmocka-targets.cmake
+lib/libcmocka.so
+lib/libcmocka.so.0
+lib/libcmocka.so.1.0.1
+lib/pkgconfig/cmocka.pc
diff --git a/cmocka201/PLIST.new b/cmocka201/PLIST.new
new file mode 100644
index 0000000000..689c7381b5
--- /dev/null
+++ b/cmocka201/PLIST.new
@@ -0,0 +1,12 @@
+@comment $NetBSD$
+include/cmocka.h
+include/cmocka_pbc.h
+include/cmocka_version.h
+lib/cmake/cmocka/cmocka-config-version.cmake
+lib/cmake/cmocka/cmocka-config.cmake
+lib/cmake/cmocka/cmocka-targets-noconfig.cmake
+lib/cmake/cmocka/cmocka-targets.cmake
+lib/libcmocka.so
+lib/libcmocka.so.0
+lib/libcmocka.so.1.0.1
+lib/pkgconfig/cmocka.pc
diff --git a/cmocka201/buildlink3.mk b/cmocka201/buildlink3.mk
new file mode 100644
index 0000000000..584ee41ad8
--- /dev/null
+++ b/cmocka201/buildlink3.mk
@@ -0,0 +1,13 @@
+# $NetBSD: buildlink3.mk,v 1.2 2019/11/23 08:45:45 mef Exp $
+
+BUILDLINK_TREE+=	cmocka
+
+.if !defined(CMOCKA_BUILDLINK3_MK)
+CMOCKA_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.cmocka+=	cmocka>=1.1.3
+BUILDLINK_ABI_DEPENDS.cmocka?=	cmocka>=1.1.5
+BUILDLINK_PKGSRCDIR.cmocka?=	../../devel/cmocka
+.endif	# CMOCKA_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-cmocka
diff --git a/cmocka201/distinfo b/cmocka201/distinfo
new file mode 100644
index 0000000000..41894ca790
--- /dev/null
+++ b/cmocka201/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.13 2025/07/23 08:09:09 pin Exp $
+
+BLAKE2s (cmocka-2.0.1.tar.xz) = 15b959f70aa18050d69e97e8455c212b0312b7f9ddf34a412a132cd9567408d3
+SHA512 (cmocka-2.0.1.tar.xz) = 752ddb757d73186bcba1c1179917a2a2ef62992caa2aa3639cc1c88258c94ab3de5100a874d99501d446aeb24d6dd4a0d12466b4a97ee01730b8b13700c3b5a4
+Size (cmocka-2.0.1.tar.xz) = 121112 bytes
+SHA1 (patch-CompilerChecks.cmake) = fb95ed5a88c4bb5b2bb82b0a4005217ef9de8d28
diff --git a/cmocka201/patches/patch-CompilerChecks.cmake b/cmocka201/patches/patch-CompilerChecks.cmake
new file mode 100644
index 0000000000..ae4328e543
--- /dev/null
+++ b/cmocka201/patches/patch-CompilerChecks.cmake
@@ -0,0 +1,32 @@
+$NetBSD: patch-CompilerChecks.cmake,v 1.3 2025/07/23 08:09:09 pin Exp $
+
+Let PkgSrc handle security features.
+
+--- CompilerChecks.cmake.orig	2026-05-02 12:33:09.586028113 +0000
++++ CompilerChecks.cmake
+@@ -73,25 +73,6 @@ if (UNIX)
+         endif()
+     endif()
+ 
+-    check_c_compiler_flag_ssp("-fstack-protector-strong" WITH_STACK_PROTECTOR_STRONG)
+-    if (WITH_STACK_PROTECTOR_STRONG)
+-        list(APPEND SUPPORTED_COMPILER_FLAGS "-fstack-protector-strong")
+-        # This is needed as Solaris and others have a seperate libssp
+-        list(APPEND SUPPORTED_LINKER_FLAGS "-fstack-protector-strong")
+-    else (WITH_STACK_PROTECTOR_STRONG)
+-        check_c_compiler_flag_ssp("-fstack-protector" WITH_STACK_PROTECTOR)
+-        if (WITH_STACK_PROTECTOR)
+-            list(APPEND SUPPORTED_COMPILER_FLAGS "-fstack-protector")
+-            # This is needed as Solaris and others have a seperate libssp
+-            list(APPEND SUPPORTED_LINKER_FLAGS "-fstack-protector")
+-        endif()
+-    endif (WITH_STACK_PROTECTOR_STRONG)
+-
+-    check_c_compiler_flag_ssp("-fstack-clash-protection" WITH_STACK_CLASH_PROTECTION)
+-    if (WITH_STACK_CLASH_PROTECTION)
+-        list(APPEND SUPPORTED_COMPILER_FLAGS "-fstack-clash-protection")
+-    endif()
+-
+     if (PICKY_DEVELOPER)
+         add_c_compiler_flag("-Wno-error=deprecated-declarations" SUPPORTED_COMPILER_FLAGS)
+         add_c_compiler_flag("-Wno-error=tautological-compare" SUPPORTED_COMPILER_FLAGS)
diff --git a/zimh/Makefile b/zimh/Makefile
index d68e2e7392..e1f9f7b4ba 100644
--- a/zimh/Makefile
+++ b/zimh/Makefile
@@ -16,11 +16,13 @@ LICENSE=	mit
 USE_TOOLS+=	bison git pkg-config
 
 TOOL_DEPENDS+=  ninja-build-[0-9]*:../../devel/ninja-build
-TOOL_DEPENDS+=	cmocka>=1.1.8:../../devel/cmocka
+#TOOL_DEPENDS+=	cmocka>=1.1.8:../../devel/cmocka
+#TOOL_DEPENDS+=	cmocka>=2.0.1:../../wip/cmocka201
 DEPENDS+=       dejavu-ttf-[0-9]*:../../fonts/dejavu-ttf
 
 .include "../../devel/cmake/build.mk"
 #.include "../../devel/cmocka/buildlink3.mk"  # enabling this makes cmake find cmocka, but also to a build failure.
+#.include "../../wip/cmocka201/buildlink3.mk"  # enabling this makes cmake find cmocka, but also to a different build failure.
 .include "../../devel/SDL2/buildlink3.mk"
 .include "../../fonts/SDL2_ttf/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
diff --git a/zimh/TODO b/zimh/TODO
index 0f4e1817d9..43c1288dd7 100644
--- a/zimh/TODO
+++ b/zimh/TODO
@@ -7,3 +7,8 @@ At least:
 even though the Makefile has "TOOL_DEPENDS+=	cmocka>=1.1.8:../../devel/cmocka"
 
 Do we need ".include "../../mk/dlopen.buildlink3.mk"" ?
+
+Get ../libslirp491 into main pkgsrc, since installing it conflicts with e.g.
+qemu.
+
+Get ../cmocka201 into main pkgsrc.
Prev by Date: Update Makefile for zimh and libslirp491
Next by Date: zimh: update to 7c6bd72539a
Previous by Thread: Update Makefile for zimh and libslirp491
Next by Thread: zimh: update to 7c6bd72539a
Indexes:
Home | Main Index | Thread Index | Old Index