Fri Jun 22 15:56:56 2018 UTC ()
Expect pid_t from fork() and waitpid() to fix build on SmartOS. Quell pkglint.


(schmonz)
diff -r1.4 -r1.5 pkgsrc/devel/cpputest/Makefile
diff -r1.2 -r1.3 pkgsrc/devel/cpputest/distinfo
diff -r0 -r1.1 pkgsrc/devel/cpputest/patches/patch-include_CppUTest_PlatformSpecificFunctions.h
diff -r0 -r1.1 pkgsrc/devel/cpputest/patches/patch-src_Platforms_Gcc_UtestPlatform.cpp
cvs diff -r1.4 -r1.5 pkgsrc/devel/cpputest/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/cpputest/Makefile 2017/08/14 23:42:08 1.4
+++ pkgsrc/devel/cpputest/Makefile 2018/06/22 15:56:56 1.5
@@ -1,21 +1,21 @@ @@ -1,21 +1,21 @@
1# $NetBSD: Makefile,v 1.4 2017/08/14 23:42:08 schmonz Exp $ 1# $NetBSD: Makefile,v 1.5 2018/06/22 15:56:56 schmonz Exp $
2 2
 3GITHUB_PROJECT= cpputest
 4GITHUB_TAG= v${PKGVERSION_NOREV}
3DISTNAME= cpputest-3.8 5DISTNAME= cpputest-3.8
4PKGREVISION= 1 6PKGREVISION= 1
5CATEGORIES= devel 7CATEGORIES= devel
6MASTER_SITES= ${MASTER_SITE_GITHUB:=cpputest/} 8MASTER_SITES= ${MASTER_SITE_GITHUB:=cpputest/}
7GITHUB_TAG= v${PKGVERSION_NOREV} 
8GITHUB_PROJECT= cpputest 
9 9
10MAINTAINER= schmonz@NetBSD.org 10MAINTAINER= schmonz@NetBSD.org
11HOMEPAGE= http://cpputest.github.io/ 11HOMEPAGE= http://cpputest.github.io/
12COMMENT= Unit testing and mocking framework for C/C++ 12COMMENT= Unit testing and mocking framework for C/C++
13LICENSE= modified-bsd 13LICENSE= modified-bsd
14 14
15PKGCONFIG_OVERRIDE+= cpputest.pc.in 15PKGCONFIG_OVERRIDE+= cpputest.pc.in
16 16
17#USE_CMAKE= yes 17#USE_CMAKE= yes
18USE_LIBTOOL= yes 18USE_LIBTOOL= yes
19GNU_CONFIGURE= yes 19GNU_CONFIGURE= yes
20CONFIGURE_SCRIPT= ../configure 20CONFIGURE_SCRIPT= ../configure
21CONFIGURE_DIRS= cpputest_build 21CONFIGURE_DIRS= cpputest_build
cvs diff -r1.2 -r1.3 pkgsrc/devel/cpputest/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/cpputest/distinfo 2016/06/07 11:12:02 1.2
+++ pkgsrc/devel/cpputest/distinfo 2018/06/22 15:56:56 1.3
@@ -1,6 +1,8 @@ @@ -1,6 +1,8 @@
1$NetBSD: distinfo,v 1.2 2016/06/07 11:12:02 schmonz Exp $ 1$NetBSD: distinfo,v 1.3 2018/06/22 15:56:56 schmonz Exp $
2 2
3SHA1 (cpputest-3.8.tar.gz) = c68f8b59d0beb6d4e6953173ec3611f801cdb3a1 3SHA1 (cpputest-3.8.tar.gz) = c68f8b59d0beb6d4e6953173ec3611f801cdb3a1
4RMD160 (cpputest-3.8.tar.gz) = c1a4fad966bd8c557fbe62dde0d418b7d1b529ec 4RMD160 (cpputest-3.8.tar.gz) = c1a4fad966bd8c557fbe62dde0d418b7d1b529ec
5SHA512 (cpputest-3.8.tar.gz) = 42b9a98549e1296ab9dfcd40bb94e1ac634fc1e70ad6250654ca0fa254c63e0349ae9ccd0b9d72c4bde1f7baccde97e08ce3e6d1fff3e464c3d9e8ae5949185f 5SHA512 (cpputest-3.8.tar.gz) = 42b9a98549e1296ab9dfcd40bb94e1ac634fc1e70ad6250654ca0fa254c63e0349ae9ccd0b9d72c4bde1f7baccde97e08ce3e6d1fff3e464c3d9e8ae5949185f
6Size (cpputest-3.8.tar.gz) = 2333302 bytes 6Size (cpputest-3.8.tar.gz) = 2333302 bytes
 7SHA1 (patch-include_CppUTest_PlatformSpecificFunctions.h) = afb43662631efd428486b8759c098d9f81bb8470
 8SHA1 (patch-src_Platforms_Gcc_UtestPlatform.cpp) = 436725ac8e2d6b71d2488cd1076d55082104c3bb
File Added: pkgsrc/devel/cpputest/patches/patch-include_CppUTest_PlatformSpecificFunctions.h
$NetBSD: patch-include_CppUTest_PlatformSpecificFunctions.h,v 1.1 2018/06/22 15:56:56 schmonz Exp $

Expect pid_t from fork() and waitpid().

--- include/CppUTest/PlatformSpecificFunctions.h.orig	2016-05-25 05:41:47.000000000 +0000
+++ include/CppUTest/PlatformSpecificFunctions.h
@@ -33,8 +33,8 @@ TestOutput::WorkingEnvironment PlatformS
 
 class TestPlugin;
 extern void (*PlatformSpecificRunTestInASeperateProcess)(UtestShell* shell, TestPlugin* plugin, TestResult* result);
-extern int (*PlatformSpecificFork)(void);
-extern int (*PlatformSpecificWaitPid)(int pid, int* status, int options);
+extern pid_t (*PlatformSpecificFork)(void);
+extern pid_t (*PlatformSpecificWaitPid)(int pid, int* status, int options);
 
 /* Platform specific interface we use in order to minimize dependencies with LibC.
  * This enables porting to different embedded platforms.
File Added: pkgsrc/devel/cpputest/patches/patch-src_Platforms_Gcc_UtestPlatform.cpp
$NetBSD: patch-src_Platforms_Gcc_UtestPlatform.cpp,v 1.1 2018/06/22 15:56:56 schmonz Exp $

Expect pid_t from fork() and waitpid().

--- src/Platforms/Gcc/UtestPlatform.cpp.orig	2018-06-22 15:45:32.759762992 +0000
+++ src/Platforms/Gcc/UtestPlatform.cpp
@@ -132,8 +132,8 @@ TestOutput::WorkingEnvironment PlatformS
 
 void (*PlatformSpecificRunTestInASeperateProcess)(UtestShell* shell, TestPlugin* plugin, TestResult* result) =
         GccPlatformSpecificRunTestInASeperateProcess;
-int (*PlatformSpecificFork)(void) = PlatformSpecificForkImplementation;
-int (*PlatformSpecificWaitPid)(int, int*, int) = PlatformSpecificWaitPidImplementation;
+pid_t (*PlatformSpecificFork)(void) = PlatformSpecificForkImplementation;
+pid_t (*PlatformSpecificWaitPid)(int, int*, int) = PlatformSpecificWaitPidImplementation;
 
 extern "C" {