remove cmocka: importing soon

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: remove cmocka: importing soon
From: pin <voidpin%protonmail.com@localhost>
Date: Sat, 06 Jan 2024 09:00:39 +0000
Module Name:	pkgsrc-wip
Committed By:	pin <voidpin%protonmail.com@localhost>
Pushed By:	pin
Date:		Sat Jan 6 10:00:39 2024 +0100
Changeset:	24d2c588fa4492c732bb302073f7c9226d30c856

Modified Files:
	Makefile
	aircrack-ng/Makefile
Removed Files:
	cmocka/DESCR
	cmocka/Makefile
	cmocka/PLIST
	cmocka/buildlink3.mk
	cmocka/distinfo
	cmocka/patches/patch-CompilerChecks.cmake
	cmocka/patches/patch-include_cmocka.h

Log Message:
remove cmocka: importing soon

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

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

diffstat:
 Makefile                                  |  1 -
 aircrack-ng/Makefile                      |  2 +-
 cmocka/DESCR                              |  4 ----
 cmocka/Makefile                           | 18 ----------------
 cmocka/PLIST                              | 10 ---------
 cmocka/buildlink3.mk                      | 13 -----------
 cmocka/distinfo                           |  7 ------
 cmocka/patches/patch-CompilerChecks.cmake | 36 -------------------------------
 cmocka/patches/patch-include_cmocka.h     | 18 ----------------
 9 files changed, 1 insertion(+), 108 deletions(-)

diffs:
diff --git a/Makefile b/Makefile
index d5027e7f0e..0dac7f61f0 100644
--- a/Makefile
+++ b/Makefile
@@ -487,7 +487,6 @@ SUBDIR+=	clustershell
 SUBDIR+=	cm-unicode-ttf
 SUBDIR+=	cmetrics
 SUBDIR+=	cmoc
-SUBDIR+=	cmocka
 SUBDIR+=	cmvnd-fonts
 SUBDIR+=	coccigrep
 SUBDIR+=	cockatrice
diff --git a/aircrack-ng/Makefile b/aircrack-ng/Makefile
index 90223389f4..d34e535263 100644
--- a/aircrack-ng/Makefile
+++ b/aircrack-ng/Makefile
@@ -21,6 +21,6 @@ pre-configure:
 .include "../../security/openssl/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../devel/pcre2/buildlink3.mk"
-.include "../../wip/cmocka/buildlink3.mk"
+.include "../../devel/cmocka/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/cmocka/DESCR b/cmocka/DESCR
deleted file mode 100644
index 6a138e7859..0000000000
--- a/cmocka/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-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/cmocka/Makefile b/cmocka/Makefile
deleted file mode 100644
index 5279f318ed..0000000000
--- a/cmocka/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-# $NetBSD: Makefile,v 1.11 2023/01/24 22:20:20 wiz Exp $
-
-DISTNAME=	cmocka-1.1.7
-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_ARGS+=	-DWITH_WERROR_UNINITIALIZED_FLAG=0
-
-.include "../../devel/cmake/build.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/cmocka/PLIST b/cmocka/PLIST
deleted file mode 100644
index 65e6e85392..0000000000
--- a/cmocka/PLIST
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $NetBSD$
-include/cmocka.h
-include/cmocka_pbc.h
-lib/cmake/cmocka/cmocka-config-noconfig.cmake
-lib/cmake/cmocka/cmocka-config-version.cmake
-lib/cmake/cmocka/cmocka-config.cmake
-lib/libcmocka.so
-lib/libcmocka.so.0
-lib/libcmocka.so.0.8.0
-lib/pkgconfig/cmocka.pc
diff --git a/cmocka/buildlink3.mk b/cmocka/buildlink3.mk
deleted file mode 100644
index 4f2c767187..0000000000
--- a/cmocka/buildlink3.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-# $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.7
-BUILDLINK_PKGSRCDIR.cmocka?=	../../wip/cmocka
-.endif	# CMOCKA_BUILDLINK3_MK
-
-BUILDLINK_TREE+=	-cmocka
diff --git a/cmocka/distinfo b/cmocka/distinfo
deleted file mode 100644
index 7667724afb..0000000000
--- a/cmocka/distinfo
+++ /dev/null
@@ -1,7 +0,0 @@
-$NetBSD: distinfo,v 1.11 2021/10/26 10:14:25 nia Exp $
-
-BLAKE2s (cmocka-1.1.7.tar.xz) = 319b75e3a0ed138f512913cd4e130d1dc977763a5d25f7378392ca28396a2955
-SHA512 (cmocka-1.1.7.tar.xz) = fe451893474dce1270e12af707a9a8fe1f0217e1782b4e1a67d25dadf56ff4a5e7dbc9ba4431f774aedffa46a40a28a6a0488df24feefb2f93e90fd2369c2c88
-Size (cmocka-1.1.7.tar.xz) = 84064 bytes
-SHA1 (patch-CompilerChecks.cmake) = 08052e3fac8c3c850bfa9a96c2fa30fde377dd95
-SHA1 (patch-include_cmocka.h) = bfde5dbac32b37d1cd31fa1f1b452ce163b0cf53
diff --git a/cmocka/patches/patch-CompilerChecks.cmake b/cmocka/patches/patch-CompilerChecks.cmake
deleted file mode 100644
index dce2aca337..0000000000
--- a/cmocka/patches/patch-CompilerChecks.cmake
+++ /dev/null
@@ -1,36 +0,0 @@
-$NetBSD$
-
-Let PkgSrc handle security features.
-
---- CompilerChecks.cmake.orig	2024-01-05 09:27:46.665856486 +0000
-+++ CompilerChecks.cmake
-@@ -66,29 +66,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 has a seperate libssp
--        if (SOLARIS)
--            list(APPEND SUPPORTED_LINKER_FLAGS "-fstack-protector-strong")
--        endif()
--    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 has a seperate libssp
--            if (SOLARIS)
--                list(APPEND SUPPORTED_LINKER_FLAGS "-fstack-protector")
--            endif()
--        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/cmocka/patches/patch-include_cmocka.h b/cmocka/patches/patch-include_cmocka.h
deleted file mode 100644
index 3735807aaf..0000000000
--- a/cmocka/patches/patch-include_cmocka.h
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-C99 fix.
-
---- include/cmocka.h.orig	2024-01-05 09:30:00.219203105 +0000
-+++ include/cmocka.h
-@@ -121,6 +121,11 @@ typedef uintmax_t LargestIntegralType;
-     ((LargestIntegralType)(value))
- 
- /* Smallest integral type capable of holding a pointer. */
-+#if (__STDC_VERSION__ - 0 >= 199901L) && !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED)
-+# include <stdint.h>
-+# define _UINTPTR_T
-+# define _UINTPTR_T_DEFINED
-+#endif
- #if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED) && !defined(HAVE_UINTPTR_T)
- # if defined(_WIN32)
-     /* WIN32 is an ILP32 platform */
Prev by Date: s-nail: keep rc as example
Next by Date: py-aioquic: Import py-aioquic-0.9.24 as wip/py-aioquic
Previous by Thread: s-nail: keep rc as example
Next by Thread: py-aioquic: Import py-aioquic-0.9.24 as wip/py-aioquic
Indexes:
Home | Main Index | Thread Index | Old Index