mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-02 13:59:59 +00:00
cmocka: upgrade 1.1.7 -> 1.1.8
ChangeLog: https://gitlab.com/cmocka/cmocka/-/blob/cmocka-1.1.8/ChangeLog Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
+2
-5
@@ -6,14 +6,11 @@ HOMEPAGE = "https://cmocka.org/"
|
|||||||
LICENSE = "Apache-2.0"
|
LICENSE = "Apache-2.0"
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57"
|
LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57"
|
||||||
|
|
||||||
SRCREV = "a01cc69ee9536f90e57c61a198f2d1944d3d4313"
|
SRCREV = "eba4d6ffca53b500ab8dfabc30256bb6c3088b2b"
|
||||||
PV .= "+git"
|
SRC_URI = "git://git.cryptomilk.org/projects/cmocka.git;protocol=https;branch=stable-1.1;tag=cmocka-${PV} \
|
||||||
SRC_URI = "git://git.cryptomilk.org/projects/cmocka.git;protocol=https;branch=stable-1.1 \
|
|
||||||
file://0001-include-Check-for-previous-declaration-of-uintptr_t.patch \
|
|
||||||
file://run-ptest \
|
file://run-ptest \
|
||||||
"
|
"
|
||||||
|
|
||||||
|
|
||||||
inherit cmake ptest
|
inherit cmake ptest
|
||||||
|
|
||||||
EXTRA_OECMAKE += "${@bb.utils.contains('PTEST_ENABLED', '1', '-DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=ON', '', d)}"
|
EXTRA_OECMAKE += "${@bb.utils.contains('PTEST_ENABLED', '1', '-DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=ON', '', d)}"
|
||||||
-43
@@ -1,43 +0,0 @@
|
|||||||
From a54e035f802e79e3292d8ad39a14bd7c060eb7b1 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Breno Leitao <breno.leitao@gmail.com>
|
|
||||||
Date: Tue, 21 Mar 2023 21:58:28 -0700
|
|
||||||
Subject: [PATCH] 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.
|
|
||||||
|
|
||||||
Taken from Alpine
|
|
||||||
|
|
||||||
Upstream-Status: Pending
|
|
||||||
Signed-off-by: Breno Leitao <breno.leitao@gmail.com>
|
|
||||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
||||||
---
|
|
||||||
include/cmocka.h | 3 ++-
|
|
||||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/include/cmocka.h b/include/cmocka.h
|
|
||||||
index a21d965..f540793 100644
|
|
||||||
--- a/include/cmocka.h
|
|
||||||
+++ b/include/cmocka.h
|
|
||||||
@@ -121,7 +121,7 @@ typedef uintmax_t LargestIntegralType;
|
|
||||||
((LargestIntegralType)(value))
|
|
||||||
|
|
||||||
/* Smallest integral type capable of holding a pointer. */
|
|
||||||
-#if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED) && !defined(HAVE_UINTPTR_T)
|
|
||||||
+#if !defined(_UINTPTR_T) && !defined(_UINTPTR_T_DEFINED) && !defined(HAVE_UINTPTR_T) && !defined(__DEFINED_uintptr_t)
|
|
||||||
# if defined(_WIN32)
|
|
||||||
/* WIN32 is an ILP32 platform */
|
|
||||||
typedef unsigned int uintptr_t;
|
|
||||||
@@ -147,6 +147,7 @@ typedef uintmax_t LargestIntegralType;
|
|
||||||
|
|
||||||
# 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. */
|
|
||||||
--
|
|
||||||
2.40.0
|
|
||||||
|
|
||||||
Reference in New Issue
Block a user