Fri Feb 2 10:31:07 2018 UTC ()
cmocka: Avoid insane build layout, no functional change.
(jperkin)
diff -r1.4 -r1.5 pkgsrc/devel/cmocka/Makefile
diff -r1.5 -r1.6 pkgsrc/devel/cmocka/distinfo
diff -r1.1 -r0 pkgsrc/devel/cmocka/patches/patch-.._include_cmocka.h
diff -r1.1 -r0 pkgsrc/devel/cmocka/patches/patch-.._src_cmocka.c
diff -r0 -r1.1 pkgsrc/devel/cmocka/patches/patch-include_cmocka.h
diff -r0 -r1.1 pkgsrc/devel/cmocka/patches/patch-src_cmocka.c
--- pkgsrc/devel/cmocka/Makefile 2016/08/06 15:03:30 1.4
+++ pkgsrc/devel/cmocka/Makefile 2018/02/02 10:31:07 1.5
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/08/06 15:03:30 mef Exp $
+# $NetBSD: Makefile,v 1.5 2018/02/02 10:31:07 jperkin Exp $
DISTNAME= cmocka-1.0.1
CATEGORIES= devel
@@ -11,11 +11,11 @@
LICENSE= apache-2.0
USE_CMAKE= yes
-WRKSRC= ${WRKDIR}/${DISTNAME}/build
-CMAKE_ARG_PATH= ${WRKDIR}/${DISTNAME}
+CONFIGURE_DIRS= ${WRKDIR}/build
+CMAKE_ARG_PATH= ${WRKSRC}
+
post-extract:
- mkdir -p ${WRKSRC}
- rm -f ${WRKDIR}/${DISTNAME}/CMakeCache.txt
+ ${MKDIR} ${WRKDIR}/build
.include "../../mk/bsd.pkg.mk"
--- pkgsrc/devel/cmocka/distinfo 2016/08/06 15:03:30 1.5
+++ pkgsrc/devel/cmocka/distinfo 2018/02/02 10:31:07 1.6
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2016/08/06 15:03:30 mef Exp $
+$NetBSD: distinfo,v 1.6 2018/02/02 10:31:07 jperkin Exp $
SHA1 (cmocka-1.0.1.tar.xz) = 1f9baabbac3d8b777e83d5c84b64954d019dea34
RMD160 (cmocka-1.0.1.tar.xz) = d53133a09f2791d65b9fa732d0f4e3b8fe0f65e5
SHA512 (cmocka-1.0.1.tar.xz) = 142b3293a8ab137904d07f1ac6a56daf0afbbfcf7816a582c9998b6225aa5d6fe5f2d1b889de7b187142fc24ca4d1cfdbd630e8783858bc9ce89217ff05abc1e
Size (cmocka-1.0.1.tar.xz) = 80240 bytes
-SHA1 (patch-.._include_cmocka.h) = 3aefedc23752eb5cf0fe2b7b43018b7e006bc0e8
+SHA1 (patch-include_cmocka.h) = f34a92589ce62de6c4fdc8232fc6e0c4bb43aa3d
-SHA1 (patch-.._src_cmocka.c) = 6519ad5d17aa04289ce7d834d181a499f85ee7fc
+SHA1 (patch-src_cmocka.c) = a389be7815a861a19dfb2f555b7681ef9013ee80
$NetBSD: patch-include_cmocka.h,v 1.1 2018/02/02 10:31:07 jperkin Exp $
C99 fix.
--- include/cmocka.h.orig 2015-03-25 16:04:39.000000000 +0000
+++ include/cmocka.h
@@ -100,6 +100,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)
# if defined(_WIN32)
/* WIN32 is an ILP32 platform */
$NetBSD: patch-src_cmocka.c,v 1.1 2018/02/02 10:31:07 jperkin Exp $
C99 fix.
--- src/cmocka.c.orig 2015-06-08 12:54:44.000000000 +0000
+++ src/cmocka.c
@@ -960,7 +960,7 @@ static int memory_equal_display_error(co
}
if (differences) {
cm_print_error("%d bytes of %p and %p differ\n", differences,
- a, b);
+ (const void *)a, (const void *)b);
return 0;
}
return 1;
@@ -985,7 +985,7 @@ static int memory_not_equal_display_erro
}
if (same == size) {
cm_print_error("%"PRIdS "bytes of %p and %p the same\n", same,
- a, b);
+ (const void *)a, (const void *)b);
return 0;
}
return 1;
@@ -1646,7 +1646,7 @@ void _test_free(void* const ptr, const c
file, line,
ptr, (unsigned long)block_info->size,
block_info->location.file, block_info->location.line,
- &guard[j]);
+ (const void *)&guard[j]);
_fail(file, line);
}
}