CVS commit: pkgsrc/devel/cpputest

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Fri Jun 22 15:56:56 UTC 2018

Modified Files:
        pkgsrc/devel/cpputest: Makefile distinfo
Added Files:
        pkgsrc/devel/cpputest/patches:
            patch-include_CppUTest_PlatformSpecificFunctions.h
            patch-src_Platforms_Gcc_UtestPlatform.cpp

Log Message:
Expect pid_t from fork() and waitpid() to fix build on SmartOS. Quell pkglint.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/cpputest/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/cpputest/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/devel/cpputest/patches/patch-include_CppUTest_PlatformSpecificFunctions.h \
    pkgsrc/devel/cpputest/patches/patch-src_Platforms_Gcc_UtestPlatform.cpp

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

Modified files:

Index: pkgsrc/devel/cpputest/Makefile
diff -u pkgsrc/devel/cpputest/Makefile:1.4 pkgsrc/devel/cpputest/Makefile:1.5
--- pkgsrc/devel/cpputest/Makefile:1.4  Mon Aug 14 23:42:08 2017
+++ pkgsrc/devel/cpputest/Makefile      Fri Jun 22 15:56:56 2018
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2017/08/14 23:42:08 schmonz Exp $
+# $NetBSD: Makefile,v 1.5 2018/06/22 15:56:56 schmonz Exp $
 
+GITHUB_PROJECT=                cpputest
+GITHUB_TAG=            v${PKGVERSION_NOREV}
 DISTNAME=              cpputest-3.8
 PKGREVISION=           1
 CATEGORIES=            devel
 MASTER_SITES=          ${MASTER_SITE_GITHUB:=cpputest/}
-GITHUB_TAG=            v${PKGVERSION_NOREV}
-GITHUB_PROJECT=                cpputest
 
 MAINTAINER=            schmonz%NetBSD.org@localhost
 HOMEPAGE=              http://cpputest.github.io/

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

Added files:

Index: pkgsrc/devel/cpputest/patches/patch-include_CppUTest_PlatformSpecificFunctions.h
diff -u /dev/null pkgsrc/devel/cpputest/patches/patch-include_CppUTest_PlatformSpecificFunctions.h:1.1
--- /dev/null   Fri Jun 22 15:56:56 2018
+++ pkgsrc/devel/cpputest/patches/patch-include_CppUTest_PlatformSpecificFunctions.h    Fri Jun 22 15:56:56 2018
@@ -0,0 +1,17 @@
+$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.
Index: pkgsrc/devel/cpputest/patches/patch-src_Platforms_Gcc_UtestPlatform.cpp
diff -u /dev/null pkgsrc/devel/cpputest/patches/patch-src_Platforms_Gcc_UtestPlatform.cpp:1.1
--- /dev/null   Fri Jun 22 15:56:56 2018
+++ pkgsrc/devel/cpputest/patches/patch-src_Platforms_Gcc_UtestPlatform.cpp     Fri Jun 22 15:56:56 2018
@@ -0,0 +1,17 @@
+$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" {
+