svn commit: r465409 - in head/sysutils/cmocka: . files

[Devin Teske]

> On Mar 23, 2018, at 2:20 PM, Devin Teske <dteske at FreeBSD.org> wrote:
> 
> Author: dteske
> Date: Fri Mar 23 21:20:04 2018
> New Revision: 465409
> URL: https://svnweb.freebsd.org/changeset/ports/465409
> 
> Log:
>  Fix sysutils/cmocka build on powerpc64
> 
>  Make sure uintptr_t isn't double-defined
> 
>  PR:		ports/224959
>  Submitted by:	jhibbits
>  Reported by:	jhibbits
>  Reviewed by:	imp
>  Approved by:	imp (mentor)
> 

Differential Revision:	https://reviews.freebsd.org/D14713
-- 
Devin


> Added:
>  head/sysutils/cmocka/files/
>  head/sysutils/cmocka/files/patch-include_cmocka.h   (contents, props changed)
> Modified:
>  head/sysutils/cmocka/Makefile
> 
> Modified: head/sysutils/cmocka/Makefile
> ==============================================================================
> --- head/sysutils/cmocka/Makefile	Fri Mar 23 20:48:16 2018	(r465408)
> +++ head/sysutils/cmocka/Makefile	Fri Mar 23 21:20:04 2018	(r465409)
> @@ -2,6 +2,7 @@
> 
> PORTNAME=	cmocka
> PORTVERSION=	1.1.1
> +PORTREVISION=	1
> CATEGORIES=	sysutils
> MASTER_SITES=	https://cmocka.org/files/1.1/ \
> 		LOCAL/dteske
> 
> Added: head/sysutils/cmocka/files/patch-include_cmocka.h
> ==============================================================================
> --- /dev/null	00:00:00 1970	(empty, because file is newly added)
> +++ head/sysutils/cmocka/files/patch-include_cmocka.h	Fri Mar 23 21:20:04 2018	(r465409)
> @@ -0,0 +1,19 @@
> +--- include/cmocka.h.orig	2018-01-02 22:14:13.670138000 -0600
> ++++ include/cmocka.h	2018-01-02 22:35:26.399769000 -0600
> +@@ -110,7 +110,7 @@
> +     ((LargestIntegralType)(value))
> + 
> + /* Smallest integral type capable of holding a pointer. */
> +-#if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED)
> ++#if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED) && !defined(_UINTPTR_T_DECLARED)
> + # if defined(_WIN32)
> +     /* WIN32 is an ILP32 platform */
> +     typedef unsigned int uintptr_t;
> +@@ -136,6 +136,7 @@
> + 
> + # define _UINTPTR_T
> + # define _UINTPTR_T_DEFINED
> ++# define _UINTPTR_T_DECLARED
> + #endif /* !defined(_UINTPTR_T) || !defined(_UINTPTR_T_DEFINED) */
> + 
> + /* Perform an unsigned cast to uintptr_t. */
>