cmocka: update to 1.1.7.
This commit is contained in:
parent
2179cc52a6
commit
19e97a8268
3 changed files with 1285 additions and 37 deletions
|
@ -1,34 +0,0 @@
|
|||
commit f81e5b71ce78f33250347914dacc75c8463bf102
|
||||
Author: Breno Leitao <breno.leitao@gmail.com>
|
||||
Date: Wed Mar 29 15:22:38 2017 -0300
|
||||
|
||||
include: Check for previous declaration of uintptr_t
|
||||
|
||||
Adding a extra check before declaring uintptr_t. Currently musl uses
|
||||
macro __DEFINED_uintptr_t once it defines uintptr_t type. Checking
|
||||
this macro before defining it, and, defining it when uintptr_t is
|
||||
defined.
|
||||
|
||||
Signed-off-by: Breno Leitao <breno.leitao@gmail.com>
|
||||
|
||||
--- a/include/cmocka.h
|
||||
+++ b/include/cmocka.h
|
||||
@@ -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(__DEFINED_uintptr_t)
|
||||
# if defined(_WIN32)
|
||||
/* WIN32 is an ILP32 platform */
|
||||
typedef unsigned int uintptr_t;
|
||||
@@ -136,6 +136,8 @@
|
||||
|
||||
# define _UINTPTR_T
|
||||
# define _UINTPTR_T_DEFINED
|
||||
+# define __DEFINED_uintptr_t
|
||||
+
|
||||
#endif /* !defined(_UINTPTR_T) || !defined(_UINTPTR_T_DEFINED) */
|
||||
|
||||
/* Perform an unsigned cast to uintptr_t. */
|
||||
|
1282
srcpkgs/cmocka/patches/wordsize.patch
Normal file
1282
srcpkgs/cmocka/patches/wordsize.patch
Normal file
File diff suppressed because it is too large
Load diff
|
@ -1,18 +1,18 @@
|
|||
# Template file for 'cmocka'
|
||||
pkgname=cmocka
|
||||
version=1.1.5
|
||||
version=1.1.7
|
||||
revision=1
|
||||
build_style=cmake
|
||||
configure_args="-DUNIT_TESTING=ON"
|
||||
# Generated build/CMakeDoxygenDefaults.cmake is broken:
|
||||
# It contains a filename "\makeindex"
|
||||
# hostmakedepends="doxygen graphviz"
|
||||
hostmakedepends="doxygen graphviz"
|
||||
short_desc="Unit testing framework in C"
|
||||
maintainer="Orphaned <orphan@voidlinux.org>"
|
||||
license="Apache-2.0"
|
||||
homepage="https://cmocka.org/"
|
||||
distfiles="https://cmocka.org/files/${version%.*}/cmocka-${version}.tar.xz"
|
||||
checksum=f0ccd8242d55e2fd74b16ba518359151f6f8383ff8aef4976e48393f77bba8b6
|
||||
checksum=810570eb0b8d64804331f82b29ff47c790ce9cd6b163e98d47a4807047ecad82
|
||||
|
||||
cmocka-devel_package() {
|
||||
depends="cmocka-${version}_${revision}"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue