ChangeLog: https://gitlab.com/cmocka/cmocka/-/blob/cmocka-1.1.8/ChangeLog
Signed-off-by: Yi Zhao <[email protected]> --- .../{cmocka_1.1.7.bb => cmocka_1.1.8.bb} | 7 +-- ...or-previous-declaration-of-uintptr_t.patch | 43 ------------------- 2 files changed, 2 insertions(+), 48 deletions(-) rename meta-oe/recipes-test/cmocka/{cmocka_1.1.7.bb => cmocka_1.1.8.bb} (89%) delete mode 100644 meta-oe/recipes-test/cmocka/files/0001-include-Check-for-previous-declaration-of-uintptr_t.patch diff --git a/meta-oe/recipes-test/cmocka/cmocka_1.1.7.bb b/meta-oe/recipes-test/cmocka/cmocka_1.1.8.bb similarity index 89% rename from meta-oe/recipes-test/cmocka/cmocka_1.1.7.bb rename to meta-oe/recipes-test/cmocka/cmocka_1.1.8.bb index 09afe36666..f7e8b96ffb 100644 --- a/meta-oe/recipes-test/cmocka/cmocka_1.1.7.bb +++ b/meta-oe/recipes-test/cmocka/cmocka_1.1.8.bb @@ -6,14 +6,11 @@ HOMEPAGE = "https://cmocka.org/"; LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRCREV = "a01cc69ee9536f90e57c61a198f2d1944d3d4313" -PV .= "+git" -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 \ +SRCREV = "eba4d6ffca53b500ab8dfabc30256bb6c3088b2b" +SRC_URI = "git://git.cryptomilk.org/projects/cmocka.git;protocol=https;branch=stable-1.1;tag=cmocka-${PV} \ file://run-ptest \ " - inherit cmake ptest EXTRA_OECMAKE += "${@bb.utils.contains('PTEST_ENABLED', '1', '-DCMAKE_BUILD_TYPE=Debug -DUNIT_TESTING=ON', '', d)}" diff --git a/meta-oe/recipes-test/cmocka/files/0001-include-Check-for-previous-declaration-of-uintptr_t.patch b/meta-oe/recipes-test/cmocka/files/0001-include-Check-for-previous-declaration-of-uintptr_t.patch deleted file mode 100644 index 65d30ea993..0000000000 --- a/meta-oe/recipes-test/cmocka/files/0001-include-Check-for-previous-declaration-of-uintptr_t.patch +++ /dev/null @@ -1,43 +0,0 @@ -From a54e035f802e79e3292d8ad39a14bd7c060eb7b1 Mon Sep 17 00:00:00 2001 -From: Breno Leitao <[email protected]> -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 <[email protected]> -Signed-off-by: Khem Raj <[email protected]> ---- - 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 - -- 2.43.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#125186): https://lists.openembedded.org/g/openembedded-devel/message/125186 Mute This Topic: https://lists.openembedded.org/mt/118295688/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
