From patchwork Mon Aug 14 14:57:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 1821046 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RPcwQ5WCQz1yfP for ; Tue, 15 Aug 2023 00:58:30 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id E08AC81A95; Mon, 14 Aug 2023 14:58:27 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org E08AC81A95 X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VE7S06JrtCHA; Mon, 14 Aug 2023 14:58:27 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 1A70981A4E; Mon, 14 Aug 2023 14:58:26 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 1A70981A4E X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id A2AF91BF385 for ; Mon, 14 Aug 2023 14:58:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 8876181A4E for ; Mon, 14 Aug 2023 14:58:23 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 8876181A4E X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id n6yWnKaCWkA6 for ; Mon, 14 Aug 2023 14:58:22 +0000 (UTC) Received: from aposti.net (aposti.net [89.234.176.197]) by smtp1.osuosl.org (Postfix) with ESMTPS id 071D581A3B for ; Mon, 14 Aug 2023 14:58:21 +0000 (UTC) DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 071D581A3B From: Paul Cercueil To: buildroot@buildroot.org Date: Mon, 14 Aug 2023 16:57:58 +0200 Message-Id: <20230814145758.383366-1-paul@crapouillou.net> MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1692025098; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=Ef10kCf9/Zyl7+iX+bsNIrD9b4DlOYJAGLVQvKDq5Eo=; b=ke6ZpoULWTcAt6i2blsBtVzUvCpwL5JNRVOlnP3UX8T0IcfPvkAcdLkbZlCSe0WP3XX2V9 nzfkqnFv4ntVk3ijW6od6XVVwRWCvnZmf1ShcEhMu7nDxlF6X5Mj1xIMizKfNtQv6iAOsP fcb78KaG9/2CpDEuzFyf78eh66agbH4= X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (1024-bit key) header.d=crapouillou.net header.i=@crapouillou.net header.a=rsa-sha256 header.s=mail header.b=ke6ZpoUL Subject: [Buildroot] [PATCH v2 1/1] package/libiio: bump to version v0.25 X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paul Cercueil Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" The changelog is available here: https://github.com/analogdevicesinc/libiio/releases/tag/v0.25 Remove the 0001 patch as it is included in the v0.25 version. Signed-off-by: Paul Cercueil --- v2: Update .checkpackageignore file as well Signed-off-by: Paul Cercueil --- .checkpackageignore | 1 - .../0001-iiod-serial.c-fix-sparc-build.patch | 76 ------------------- package/libiio/libiio.hash | 2 +- package/libiio/libiio.mk | 2 +- 4 files changed, 2 insertions(+), 79 deletions(-) delete mode 100644 package/libiio/0001-iiod-serial.c-fix-sparc-build.patch diff --git a/.checkpackageignore b/.checkpackageignore index dfc1ba9001..a8255bffc2 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -709,7 +709,6 @@ package/libhid/0002-no-newline-in-ldflags.patch Upstream package/libhid/0003-uclinux.patch Upstream package/libical/0001-no-tests.patch Upstream package/libical/0002-icaltypes-c-icalreqstattype_from_string-copy-the-reqstattype.patch Upstream -package/libiio/0001-iiod-serial.c-fix-sparc-build.patch Upstream package/libiio/S99iiod Shellcheck Variables package/libiqrf/0001-cmake-handle-static-library-and-find-required-thread.patch Upstream package/libiqrf/0002-use-only-c-language.patch Upstream diff --git a/package/libiio/0001-iiod-serial.c-fix-sparc-build.patch b/package/libiio/0001-iiod-serial.c-fix-sparc-build.patch deleted file mode 100644 index 1c2d606e63..0000000000 --- a/package/libiio/0001-iiod-serial.c-fix-sparc-build.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 40ffc5d9b8f6e47866292bf1365ac3a5d22cf123 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Sun, 25 Sep 2022 11:19:18 +0200 -Subject: [PATCH] iiod/serial.c: fix sparc build - -Fix the following sparc build failure raised since version 0.24 and -https://github.com/analogdevicesinc/libiio/commit/2d3cae005f364742b3a9e7234d15b2fd2cbac664: - -/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.24/iiod/serial.c: In function 'serial_configure': -/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.24/iiod/serial.c:99:58: error: 'B2500000' undeclared (first use in this function); did you mean 'B1500000'? - 99 | #define CASE_BPS(bps, attr) case bps: (attr)->c_cflag |= B##bps; break - | ^ -/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.24/iiod/serial.c:127:9: note: in expansion of macro 'CASE_BPS' - 127 | CASE_BPS(2500000, &tty_attrs); - | ^~~~~~~~ -/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.24/iiod/serial.c:99:58: note: each undeclared identifier is reported only once for each function it appears in - 99 | #define CASE_BPS(bps, attr) case bps: (attr)->c_cflag |= B##bps; break - | ^ -/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.24/iiod/serial.c:127:9: note: in expansion of macro 'CASE_BPS' - 127 | CASE_BPS(2500000, &tty_attrs); - | ^~~~~~~~ -/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.24/iiod/serial.c:99:58: error: 'B3000000' undeclared (first use in this function); did you mean 'B1000000'? - 99 | #define CASE_BPS(bps, attr) case bps: (attr)->c_cflag |= B##bps; break - | ^ -/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.24/iiod/serial.c:128:9: note: in expansion of macro 'CASE_BPS' - 128 | CASE_BPS(3000000, &tty_attrs); - | ^~~~~~~~ -/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.24/iiod/serial.c:99:58: error: 'B3500000' undeclared (first use in this function); did you mean 'B1500000'? - 99 | #define CASE_BPS(bps, attr) case bps: (attr)->c_cflag |= B##bps; break - | ^ -/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.24/iiod/serial.c:129:9: note: in expansion of macro 'CASE_BPS' - 129 | CASE_BPS(3500000, &tty_attrs); - | ^~~~~~~~ -/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.24/iiod/serial.c:99:58: error: 'B4000000' undeclared (first use in this function); did you mean 'B1000000'? - 99 | #define CASE_BPS(bps, attr) case bps: (attr)->c_cflag |= B##bps; break - | ^ -/home/buildroot/autobuild/instance-0/output-1/build/libiio-0.24/iiod/serial.c:130:9: note: in expansion of macro 'CASE_BPS' - 130 | CASE_BPS(4000000, &tty_attrs); - | ^~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/8a9902f6eddaab812ebce3506ed6de686f647e02 - -Signed-off-by: Fabrice Fontaine -[yann.morin.1998@free.fr: actual backport now that upstream accepted it] -Signed-off-by: Yann E. MORIN ---- - iiod/serial.c | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/iiod/serial.c b/iiod/serial.c -index f829361d..b140d051 100644 ---- a/iiod/serial.c -+++ b/iiod/serial.c -@@ -124,10 +124,18 @@ static int serial_configure(int fd, unsigned int uart_bps, - CASE_BPS(1152000, &tty_attrs); - CASE_BPS(1500000, &tty_attrs); - CASE_BPS(2000000, &tty_attrs); -+#ifdef B2500000 /* Not available on all architectures, i.e. sparc */ - CASE_BPS(2500000, &tty_attrs); -+#endif -+#ifdef B3000000 /* Not available on all architectures, i.e. sparc */ - CASE_BPS(3000000, &tty_attrs); -+#endif -+#ifdef B3500000 /* Not available on all architectures, i.e. sparc */ - CASE_BPS(3500000, &tty_attrs); -+#endif -+#ifdef B4000000 /* Not available on all architectures, i.e. sparc */ - CASE_BPS(4000000, &tty_attrs); -+#endif - default: - IIO_ERROR("Invalid baud rate\n"); - return -EINVAL; --- -2.25.1 - diff --git a/package/libiio/libiio.hash b/package/libiio/libiio.hash index f497756eac..0f024af78c 100644 --- a/package/libiio/libiio.hash +++ b/package/libiio/libiio.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 a2b5d848531ea64fd9f95327dfd5a588bd227d9577281ec375e822702c6a52d5 libiio-0.24.tar.gz +sha256 21972599a3c143ab1f98002ad2b3f28f4aff927fde5f677478311cd4e517730c libiio-0.25.tar.gz sha256 102900208eef27b766380135906d431dba87edaa7ec6aa72e6ebd3dd67f3a97b COPYING.txt diff --git a/package/libiio/libiio.mk b/package/libiio/libiio.mk index 9e2cf454b5..733a0c90ed 100644 --- a/package/libiio/libiio.mk +++ b/package/libiio/libiio.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBIIO_VERSION = 0.24 +LIBIIO_VERSION = 0.25 LIBIIO_SITE = $(call github,analogdevicesinc,libiio,v$(LIBIIO_VERSION)) LIBIIO_INSTALL_STAGING = YES LIBIIO_LICENSE = LGPL-2.1+