diff options
| author | Devin Teske <dteske@FreeBSD.org> | 2018-03-24 05:20:04 +0800 |
|---|---|---|
| committer | Devin Teske <dteske@FreeBSD.org> | 2018-03-24 05:20:04 +0800 |
| commit | bd5c2e783d0ab003eccf718e3f44fd851f260c7a (patch) | |
| tree | d6f3e11bd3bd7dcfdd7f5eb95c28011e568a2780 | |
| parent | 263217c7536f82107166cb4b1788680e85819189 (diff) | |
| download | freebsd-ports-bd5c2e783d0ab003eccf718e3f44fd851f260c7a.tar.gz freebsd-ports-bd5c2e783d0ab003eccf718e3f44fd851f260c7a.tar.zst freebsd-ports-bd5c2e783d0ab003eccf718e3f44fd851f260c7a.zip | |
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)
Notes
Notes:
svn path=/head/; revision=465409
| -rw-r--r-- | sysutils/cmocka/Makefile | 1 | ||||
| -rw-r--r-- | sysutils/cmocka/files/patch-include_cmocka.h | 19 |
2 files changed, 20 insertions, 0 deletions
diff --git a/sysutils/cmocka/Makefile b/sysutils/cmocka/Makefile index 764ac7546148..f697256d6d6e 100644 --- a/sysutils/cmocka/Makefile +++ b/sysutils/cmocka/Makefile @@ -2,6 +2,7 @@ PORTNAME= cmocka PORTVERSION= 1.1.1 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= https://cmocka.org/files/1.1/ \ LOCAL/dteske diff --git a/sysutils/cmocka/files/patch-include_cmocka.h b/sysutils/cmocka/files/patch-include_cmocka.h new file mode 100644 index 000000000000..d91eacbda6ea --- /dev/null +++ b/sysutils/cmocka/files/patch-include_cmocka.h @@ -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. */ |