[1/2] package/cmocka: bump to version 1.1.8
diff mbox series

Message ID 20250920111244.2575859-1-dario.binacchi@amarulasolutions.com
State New
Headers show
Series
  • [1/2] package/cmocka: bump to version 1.1.8
Related show

Commit Message

Dario Binacchi Sept. 20, 2025, 11:12 a.m. UTC 
The removed patch has been merged in version 1.1.6.

Release notes:
https://gitlab.com/cmocka/cmocka/-/tags/cmocka-1.1.6
https://gitlab.com/cmocka/cmocka/-/tags/cmocka-1.1.7
https://gitlab.com/cmocka/cmocka/-/tags/cmocka-1.1.8

Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>
---
 .checkpackageignore                           |  1 -
 .../0001-Don-t-redefine-uintptr_t.patch       | 77 -------------------
 package/cmocka/cmocka.hash                    |  2 +-
 package/cmocka/cmocka.mk                      |  2 +-
 4 files changed, 2 insertions(+), 80 deletions(-)
 delete mode 100644 package/cmocka/0001-Don-t-redefine-uintptr_t.patch

Comments

'Julien Olivain' via Amarula Linux Sept. 20, 2025, 8:03 p.m. UTC | #1 
On 20/09/2025 13:12, Dario Binacchi wrote:
> The removed patch has been merged in version 1.1.6.
> 
> Release notes:
> https://gitlab.com/cmocka/cmocka/-/tags/cmocka-1.1.6
> https://gitlab.com/cmocka/cmocka/-/tags/cmocka-1.1.7
> https://gitlab.com/cmocka/cmocka/-/tags/cmocka-1.1.8
> 
> Signed-off-by: Dario Binacchi <dario.binacchi@amarulasolutions.com>

Series applied to master, thanks.

To unsubscribe from this group and stop receiving emails from it, send an email to linux-amarula+unsubscribe@amarulasolutions.com.

Patch
diff mbox series 

diff --git a/.checkpackageignore b/.checkpackageignore
index d8d0bc6969fe..17deae937c7e 100644
--- a/.checkpackageignore
+++ b/.checkpackageignore
@@ -292,7 +292,6 @@  package/chipmunk/0001-Fix-build-failure-on-musl.patch lib_patch.Upstream
 package/chocolate-doom/0001-Remove-redundant-demoextend-definition.patch lib_patch.Upstream
 package/chrony/S49chronyd lib_sysv.Variables
 package/cmake/0001-rename-cmake-rootfile.patch lib_patch.Upstream
-package/cmocka/0001-Don-t-redefine-uintptr_t.patch lib_patch.Upstream
 package/collectd/0001-src-netlink.c-remove-REG_NOERROR.patch lib_patch.Upstream
 package/connman/S45connman lib_sysv.Variables
 package/copas/0001-Do-not-load-coxpcall-for-LuaJIT.patch lib_patch.Upstream
diff --git a/package/cmocka/0001-Don-t-redefine-uintptr_t.patch b/package/cmocka/0001-Don-t-redefine-uintptr_t.patch
deleted file mode 100644
index 4123d8db22da..000000000000
--- a/package/cmocka/0001-Don-t-redefine-uintptr_t.patch
+++ /dev/null
@@ -1,77 +0,0 @@ 
-From 28ce16b29911e5adc60140b572dee177adc7a178 Mon Sep 17 00:00:00 2001
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Mon, 18 Nov 2019 18:56:46 +0100
-Subject: [PATCH] Don't redefine uintptr_t
-
-Add a call to check_type_size in ConfigureChecks.cmake and use it in
-include/cmocka.h to avoid the following redefinition error on riscv64:
-
-In file included from /data/buildroot/buildroot-test/instance-0/output/build/cmocka-1.1.5/src/cmocka.c:62:
-/data/buildroot/buildroot-test/instance-0/output/build/cmocka-1.1.5/include/cmocka.h:132:28: error: conflicting types for 'uintptr_t'
-       typedef unsigned int uintptr_t;
-                            ^~~~~~~~~
-In file included from /data/buildroot/buildroot-test/instance-0/output/host/riscv64-buildroot-linux-musl/sysroot/usr/include/stdint.h:20,
-                 from /data/buildroot/buildroot-test/instance-0/output/host/riscv64-buildroot-linux-musl/sysroot/usr/include/inttypes.h:9,
-                 from /data/buildroot/buildroot-test/instance-0/output/build/cmocka-1.1.5/src/cmocka.c:27:
-/data/buildroot/buildroot-test/instance-0/output/host/riscv64-buildroot-linux-musl/sysroot/usr/include/bits/alltypes.h:104:24: note: previous declaration of 'uintptr_t' was here
- typedef unsigned _Addr uintptr_t;
-                        ^~~~~~~~~
-
-Fixes:
- - http://autobuild.buildroot.org/results/30922c18150ea62aefe123d1b7cd1444efab963f
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
-[Retrieved from:
-https://gitlab.com/cmocka/cmocka/commit/28ce16b29911e5adc60140b572dee177adc7a178]
----
- ConfigureChecks.cmake | 3 +++
- config.h.cmake        | 4 ++++
- include/cmocka.h      | 2 +-
- 3 files changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
-index fe8da35..028774f 100644
---- a/ConfigureChecks.cmake
-+++ b/ConfigureChecks.cmake
-@@ -70,6 +70,9 @@ if (HAVE_TIME_H)
-     check_struct_has_member("struct timespec" tv_sec "time.h" HAVE_STRUCT_TIMESPEC)
- endif (HAVE_TIME_H)
- 
-+# TYPES
-+check_type_size(uintptr_t UINTPTR_T)
-+
- # FUNCTIONS
- check_function_exists(calloc HAVE_CALLOC)
- check_function_exists(exit HAVE_EXIT)
-diff --git a/config.h.cmake b/config.h.cmake
-index f8d79da..55fc69f 100644
---- a/config.h.cmake
-+++ b/config.h.cmake
-@@ -75,6 +75,10 @@
- 
- #cmakedefine HAVE_STRUCT_TIMESPEC 1
- 
-+/***************************** TYPES *****************************/
-+
-+#cmakedefine HAVE_UINTPTR_T 1
-+
- /*************************** FUNCTIONS ***************************/
- 
- /* Define to 1 if you have the `calloc' function. */
-diff --git a/include/cmocka.h b/include/cmocka.h
-index 3e923dd..0aa557e 100644
---- a/include/cmocka.h
-+++ b/include/cmocka.h
-@@ -120,7 +120,7 @@ typedef uintmax_t LargestIntegralType;
-     ((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(HAVE_UINTPTR_T)
- # if defined(_WIN32)
-     /* WIN32 is an ILP32 platform */
-     typedef unsigned int uintptr_t;
--- 
-2.22.0
-
diff --git a/package/cmocka/cmocka.hash b/package/cmocka/cmocka.hash
index 74d67d6ecb6c..8dc0532388dc 100644
--- a/package/cmocka/cmocka.hash
+++ b/package/cmocka/cmocka.hash
@@ -1,3 +1,3 @@ 
 # Locally computed:
-sha256  f0ccd8242d55e2fd74b16ba518359151f6f8383ff8aef4976e48393f77bba8b6  cmocka-1.1.5.tar.xz
+sha256  58435b558766d7f4c729ba163bdf3aec38bed3bc766dab684e3526ed0aa7c780  cmocka-1.1.8.tar.xz
 sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  COPYING
diff --git a/package/cmocka/cmocka.mk b/package/cmocka/cmocka.mk
index 297f95f46504..04a0640f4cbd 100644
--- a/package/cmocka/cmocka.mk
+++ b/package/cmocka/cmocka.mk
@@ -4,7 +4,7 @@ 
 #
 ################################################################################
 
-CMOCKA_VERSION = 1.1.5
+CMOCKA_VERSION = 1.1.8
 CMOCKA_SOURCE = cmocka-$(CMOCKA_VERSION).tar.xz
 CMOCKA_SITE = https://cmocka.org/files/1.1
 CMOCKA_LICENSE = Apache-2.0