From patchwork Sat Sep 20 11:12:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dario Binacchi X-Patchwork-Id: 4332 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 9B3F63F18B for ; Sat, 20 Sep 2025 13:13:12 +0200 (CEST) Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-afcb7338319sf370990666b.0 for ; Sat, 20 Sep 2025 04:13:12 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1758366792; cv=pass; d=google.com; s=arc-20240605; b=UTh+ROpxbnq8dei0jWiHXx5Br//QWNXKVWh1ixyMo1mP1IFhufUy6cFDuy/9yTcZqz gi7SEAUoA9eBcj6GQwvlu3ruBUrDYwsjrTrBUlk2dFtnhsgZ6JORSSjVVVdfd1S1AE1c g+udc+mo101vtldzp0h+4dpXIQxxlQRQ6ZyyMTlK8oCP2mkKoBpsKIjgDtHdWCkSQJcN bzUCMb0OMX+KYY7+ce01mFNRbbjIWA5td617SP4D5IaU09QirZzte2a22d8Hmavp8Y/Z vVEtZSk7Xrv1yYqORxoZ3e5xCixFL2dMXXEvN96IshLY4bCisA/s9gjp35zvMjR6x9mN KsDg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:message-id:date:subject:cc:to :from:dkim-signature; bh=wie8CGNBPR9QHkZDwakrQ35PyHvxxYrAkPZzTVHjFmM=; fh=Z/xx5MwKSrxWNeyskfDMj31PG3sEu4qIcEDDov2+y9I=; b=abPxu39y6R04SUYu3/h3RJGWRq9K5xzWFFfkMEscJRNjAHnAuYezU4kaU/kwXPjB2E HEKFl0aclwJlP1Mmg/E0jUi8h9pxPNEXUq+QDq/K1rvg3Dxjn2lkvAxE6v3cFY0j5Sm0 jVZOrDP5RK6/xGfj8WxBW5c2vdUXMmEpSKr0K+3G0DE/A70JueYBKBqAxB96xpyoV5Af Y2WEnZy1EDymuLcrjfzFcEy9035wQaN8z0+3fys0Hy495rUOowCbGjzNrkkFDfr47OZ7 5OXLsido8ZFkaFEovrOAXx2QiC4R6fdN3g7KpIYWufWNW0yqsCMJ9LZACBvBTyq9kdQj F4WQ==; darn=patchwork.amarulasolutions.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=qfcyf2It; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; t=1758366792; x=1758971592; darn=patchwork.amarulasolutions.com; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:x-original-authentication-results :x-original-sender:mime-version:message-id:date:subject:cc:to:from :from:to:cc:subject:date:message-id:reply-to; bh=wie8CGNBPR9QHkZDwakrQ35PyHvxxYrAkPZzTVHjFmM=; b=bTyFv6b7J5EnhOMt6XQw2D1ZVhVN+MWno9Onn9+p9wBHcz9FG+EWoTEm4ufiR73Jxa QJe/dy8AORUXNiCeAFI3n1O7pPk/wbi27luynrqSopcTrqsIxNKoWPw8wcidh9FeVIIq uhKg0t70OZrda9Jh937k6ePBIjM5MNcG8qlhU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1758366792; x=1758971592; h=list-unsubscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence :x-original-authentication-results:x-original-sender:mime-version :message-id:date:subject:cc:to:from:x-beenthere:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=wie8CGNBPR9QHkZDwakrQ35PyHvxxYrAkPZzTVHjFmM=; b=MZM1RKgG00Vf8qptEd0cNJ0BDvOQ3vvE7Ztc03NvAPmtDiSodgayMI3Juf7IRYF8Vq guKJ/bghEDfIs9GdsNc9DAxbE0lUe9NQfIciiSYNwJUZ+wSralsaQ3jDUArRo091tSGp 3j82bKHBscQGDOZjrtnZgizjg3Lm7AQzc34kNACx5cNQ521N3W7CJI2X/EN55h61S3QG Zn+NYz0iFYRBaVGhA4mL5Edqyx06ySpp/06LyRelhV7YUfEHoJDc81KqCINLutL9+sdk W8Lub4Dyi1Mz98jDQF+nVfy4/1IA8kZTRqVWHTyK+gsyT0W7l01jgaNCtSBeX5S1PkP3 hP1A== X-Forwarded-Encrypted: i=2; AJvYcCXUDqX5tEd5KJoDGWD7Vu0IvHtfwq2R7/9K5FdF5RUXKTeMN32minaZI2HZd0u8ZM9FphUgdawqsuRFGvKc@patchwork.amarulasolutions.com X-Gm-Message-State: AOJu0YxmRWktY7uZm9z1Gr4cJ84d8ShoOBEQALULNlbZ5k0n46J+sXOW nnP9UFSuPzOpElXrAhEmgG5CfosPz3RbYTSqnmdHm1WyEEYoRXxe0hROAWG7Zn5rQAqXoQ== X-Google-Smtp-Source: AGHT+IENVx6+zgxcJdtTREXHeZRqAvIo8h0pqG2q3ygKDu8yqw2VZ3ri4nabEgvOQu3mtdJIVhXJEw== X-Received: by 2002:a17:907:868e:b0:b0e:8cd4:e2d3 with SMTP id a640c23a62f3a-b24ee9dd06bmr685942566b.19.1758366792012; Sat, 20 Sep 2025 04:13:12 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com; h=ARHlJd6VUstdXj+XzP46/wAjK5LcsProSxhZBfigDoGxLvlu8g== Received: by 2002:a05:6402:2270:b0:62e:ff96:97d6 with SMTP id 4fb4d7f45d1cf-62fa734f325ls1941208a12.0.-pod-prod-05-eu; Sat, 20 Sep 2025 04:13:09 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUSdbWJCEVHzNrIX/HfVEnJKNgweie/CO5LKANSPk31xfZuv4lUvm3uxcwry/XXiiUg4odaAsFxc8uaWWNr@amarulasolutions.com X-Received: by 2002:a17:907:1b10:b0:b04:61aa:6adc with SMTP id a640c23a62f3a-b24ed97e7bamr645219266b.7.1758366789404; Sat, 20 Sep 2025 04:13:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1758366789; cv=none; d=google.com; s=arc-20240605; b=XVhEOxMpVA3Y/woZQgHyOndabdUidzlwR1WDHeNskoLXZNPvLhpO9JnyPpuSdeF8Fl 8EKd5CiSlF4cxp+8eWmSJ5gVRwNMGzXEOX6c2vMcaJu42c9p6dvEvZ9dfgIX1Df0l6vB QY7RQOJuueUKi5JEGZfVFZ51RcIuGez1mEjvohJZ9QEWE85RDpandX+kMSavusawNAYV 7oeYBI4SvrVmL0+FqNA/eShcW3gMuXP+2J7x5MVwexshIpGNh/Tx63SMZNljM6JPnD4b 1R/jEKEvAbDoZjFFvy+Rt9qSt/Z/ff5mkpr7IPY1VR6mKhz8b1b3rWPHSW1vQI+SzO29 8zFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature; bh=4jFsBcN6kprcNVT/Skq1F41EQ7EjefdR+TGHkLBOSag=; fh=XPQxnvc99ns90rXdcazQ7dZrRqgyZ7J+zf0Cq/C5UxU=; b=Dy+8pQVvqNzlNcyMeLuH6+5iVCwmZLAA1xaCfoMyU06v5JHb1q4Eh9z2t8uboEYP2x PKKItQb4MDePNhCX5F63hebl3N/YMDLI4Tz5HW2o3fZC4UOx9OpqBR7zZVQvv2BleJn2 RHk5D44U19sAlxL/R3Bgsi6J4B5ZsuaybHuz0ML0Diggf+9l1YVLie8Vjsr3ktbVYC4V hpxyGX2wJy0jFt5G2T8VMQDExwXZa58TmbuaDxxcaArbfwfsvoidqBKvF10PyIYOEF8R WltDtWATdpRAuBTqOVtXuUcm+HhU3WTALr+v0qzRt0ht++jjroIfwhbLOu+2lcd9eUSr KP+A==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=qfcyf2It; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com Received: from mail-sor-f41.google.com (mail-sor-f41.google.com. [209.85.220.41]) by mx.google.com with SMTPS id a640c23a62f3a-b1fc7d721d8sor284074066b.7.2025.09.20.04.13.09 for (Google Transport Security); Sat, 20 Sep 2025 04:13:09 -0700 (PDT) Received-SPF: pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) client-ip=209.85.220.41; X-Forwarded-Encrypted: i=1; AJvYcCWvVNDYN+WWHJEh/C2uLaAMHT+9zqLLN/RwuJ/tTRJ3huJ2VHtnBScVm8dKITC3HXV2FtfgS1bZc5iYXXM0@amarulasolutions.com X-Gm-Gg: ASbGncuA2J3bVOSqwPst+K5MnoS++Q8q17f3+MfpIN14VF0tNIYeEgAKHJvhBJyxRDI GNmHQ3CELtHgyBqmWOgRr2iz2cDDCswCYSr1ChsaTyq/3P1CaOgXQKwgyM3r06T1/oRVhDinayg rSCGKcqYu90oZVrN5ApRJe0T33Fo7VqiOk7iYqWO52XmTgxtzYNlediHoOE09Xq/v1g+T3IBSK3 1djXl4VSE/6U2mb0ai/eaJhvdEHHSB2mlmEQ/QW8H9Jhr+KJJflYAX33qHWwmtiJvEI3eYlsk91 p25NpQzljYv6E8V4CZOjCSgcL3jznnINbyItqOIAylS6iEYmh4jbyiSCdc25T0uTg4CTUCr/60W HcN6EuBoQQSJBoyNbjfXXBC/1WbhFgt0jslVpDG8b1vIzlxgNe39XQN2bx4R9/srITOUBmWIio0 ioUMD07gOzNy0dL5+TqSjWVV3SFrcGp8xZTFhadxoB1ty1pYGqbCeecsikbvGIp/SP X-Received: by 2002:a05:6402:27cb:b0:631:fe26:a661 with SMTP id 4fb4d7f45d1cf-631fe26af8dmr631734a12.3.1758366788915; Sat, 20 Sep 2025 04:13:08 -0700 (PDT) Received: from dario-ThinkPad-T14s-Gen-2i.homenet.telecomitalia.it (host-82-56-38-125.retail.telecomitalia.it. [82.56.38.125]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-62fa5d17efdsm4884874a12.15.2025.09.20.04.13.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 20 Sep 2025 04:13:08 -0700 (PDT) From: Dario Binacchi To: buildroot@buildroot.org Cc: Dario Binacchi , Joel Carlson , linux-amarula@amarulasolutions.com Subject: [PATCH 1/2] package/cmocka: bump to version 1.1.8 Date: Sat, 20 Sep 2025 13:12:43 +0200 Message-ID: <20250920111244.2575859-1-dario.binacchi@amarulasolutions.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 X-Original-Sender: dario.binacchi@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=qfcyf2It; spf=pass (google.com: domain of dario.binacchi@amarulasolutions.com designates 209.85.220.41 as permitted sender) smtp.mailfrom=dario.binacchi@amarulasolutions.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=amarulasolutions.com; dara=pass header.i=@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 --- .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 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 -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 -Reviewed-by: Andreas Schneider -[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