From patchwork Tue Jul 16 12:40:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcus Hoffmann X-Patchwork-Id: 1961083 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::133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4WNdvf0Gfxz1xrK for ; Tue, 16 Jul 2024 22:40:30 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 73B4640124; Tue, 16 Jul 2024 12:40:28 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id J82pNQ-ifoD9; Tue, 16 Jul 2024 12:40:27 +0000 (UTC) X-Comment: SPF check N/A for local connections - client-ip=140.211.166.34; helo=ash.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver= DKIM-Filter: OpenDKIM Filter v2.11.0 smtp2.osuosl.org 3563340197 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 3563340197; Tue, 16 Jul 2024 12:40:27 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id E21DD1BF38A for ; Tue, 16 Jul 2024 12:40:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id CFEFF60889 for ; Tue, 16 Jul 2024 12:40:25 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id S7sdW2436gXj for ; Tue, 16 Jul 2024 12:40:24 +0000 (UTC) Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=176.9.145.28; helo=smtp.bubu1.eu; envelope-from=buildroot@bubu1.eu; receiver= DMARC-Filter: OpenDMARC Filter v1.4.2 smtp3.osuosl.org 80D97607D9 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp3.osuosl.org 80D97607D9 Received: from smtp.bubu1.eu (smtp.bubu1.eu [176.9.145.28]) by smtp3.osuosl.org (Postfix) with ESMTPS id 80D97607D9 for ; Tue, 16 Jul 2024 12:40:24 +0000 (UTC) Received: from tuxedoOT.fritz.box (unknown [212.37.174.96]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.bubu1.eu (Postfix) with ESMTPSA id 558692C80261; Tue, 16 Jul 2024 14:40:22 +0200 (CEST) To: buildroot@buildroot.org Date: Tue, 16 Jul 2024 14:40:21 +0200 Message-Id: <20240716124021.2386621-1-buildroot@bubu1.eu> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=bubu1.eu; s=bubu; t=1721133622; bh=bH5uZgW0KSbgLfEWNHk996yB019EgXzmZiR0nJnJF10=; h=From:To:Cc:Subject:Date; b=J/Ay0LM1aZwlHnPbPDJ1IaQysnD1E5YslgBwlxO1LCv2yQGAON88mknYWsE5gb4iO fwBw9CT7nEQ55Y6SX7m/2qdAppvipPqkLywIhD3e/P5y0dzeOTTHDHbM1wa4CJP9xG jYhNBh66kCxwrGyzvy9CJ3631faYY1m79yvbXcLrQVJkjJ4Lye+2vBR2R9gSjBU4SH 61dioIrHw/BSOKfaLmRf2oTI9T17VQFgzKn7bGkNhrFi0iRiMl7OyiYxvkMVG9qJEg 3sUjzAQSxPUdR3x8u9nRz3ASk89eFs0ChctSjQ6+xXVbDaaFsQGyPXqNt4BHmoUGcU FZeovv837oa2Q== X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dmarc=pass (p=reject dis=none) header.from=bubu1.eu X-Mailman-Original-Authentication-Results: smtp3.osuosl.org; dkim=pass (2048-bit key, unprotected) header.d=bubu1.eu header.i=@bubu1.eu header.a=rsa-sha256 header.s=bubu header.b=J/Ay0LM1 Subject: [Buildroot] [PATCH] package/tio: bump to 3.5 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: , X-Patchwork-Original-From: Marcus Hoffmann via buildroot From: Marcus Hoffmann Reply-To: Marcus Hoffmann Cc: Sergio Prado Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Dependencies changed: inih dependency was removed, glib2 and lua added. Tio's meson build system fails to find luajit, so exclude that, otherwise all versions of lua >= 5.1 are supported. Retested the build for sparc and sparc64 and the compile issues have been resolved upstream by reworking the baudrate selection code quite a while ago[1]. Disable installation of man pages with new build option. [1] https://github.com/tio/tio/commit/a23be7f2c2bacef428b0e50aa93e37e5b52bdd56 Signed-off-by: Marcus Hoffmann --- package/tio/Config.in | 23 +++++++++++++---------- package/tio/tio.hash | 4 ++-- package/tio/tio.mk | 6 ++++-- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/package/tio/Config.in b/package/tio/Config.in index e4241fa5e1..953b26a349 100644 --- a/package/tio/Config.in +++ b/package/tio/Config.in @@ -1,8 +1,10 @@ config BR2_PACKAGE_TIO bool "tio" - depends on !BR2_sparc64 && !BR2_sparc depends on BR2_TOOLCHAIN_HAS_THREADS - select BR2_PACKAGE_INIH + depends on BR2_USE_MMU # glib2 + depends on BR2_USE_WCHAR # glib2 + depends on BR2_PACKAGE_HAS_LUAINTERPRETER + depends on !BR2_PACKAGE_LUAJIT help "tio" is a simple TTY terminal application which features a straightforward commandline interface to easily connect to @@ -10,12 +12,13 @@ config BR2_PACKAGE_TIO https://tio.github.io/ -# tio is disabled for sparc and sparc64 architectures because it fails -# to build with a redefinition of 'struct termio' error, with no proper -# fix or workaround for now -comment "tio is disabled for sparc and sparc64 architectures" - depends on BR2_sparc64 || BR2_sparc - -comment "tio needs a toolchain w/ threads" +comment "tio needs a toolchain w/ threads, wchar" + depends on BR2_USE_MMU depends on !BR2_sparc64 && !BR2_sparc - depends on !BR2_TOOLCHAIN_HAS_THREADS + depends on !BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR + +comment "tio needs lua (but not luajit)" + depends on BR2_USE_MMU + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_WCHAR + depends on !BR2_PACKAGE_HAS_LUAINTERPRETER || BR2_PACKAGE_LUAJIT diff --git a/package/tio/tio.hash b/package/tio/tio.hash index 02699fdeb4..d1caeeebc6 100644 --- a/package/tio/tio.hash +++ b/package/tio/tio.hash @@ -1,5 +1,5 @@ -# From https://github.com/tio/tio/releases/download/v2.7/tio-2.7.tar.xz.sha256sum: -sha256 bf8fe434848c2c1b6540af0b42503c986068176ddc1a988cf02e521e7de5daa5 tio-2.7.tar.xz +# From https://github.com/tio/tio/releases/download/v3.5/tio-3.5.tar.xz.sha256sum: +sha256 efd3e9a406f827ac22d4157e345079dde15ee5a948b24156561d6c97a54e6ec0 tio-3.5.tar.xz # Hash for license files: sha256 9248dee77ee136321f24556a96e07ff8f90461013941884a9defd0ac825ef131 LICENSE diff --git a/package/tio/tio.mk b/package/tio/tio.mk index 95831e8ce6..637a7bdd83 100644 --- a/package/tio/tio.mk +++ b/package/tio/tio.mk @@ -4,12 +4,14 @@ # ################################################################################ -TIO_VERSION = 2.7 +TIO_VERSION = 3.5 TIO_SOURCE = tio-$(TIO_VERSION).tar.xz TIO_SITE = https://github.com/tio/tio/releases/download/v$(TIO_VERSION) TIO_LICENSE = GPL-2.0+ TIO_LICENSE_FILES = LICENSE -TIO_DEPENDENCIES = inih +TIO_DEPENDENCIES = libglib2 luainterpreter + +TIO_CONF_OPTS += -Dinstall_man_pages=false ifeq ($(BR2_PACKAGE_BASH_COMPLETION),y) TIO_CONF_OPTS +=-Dbashcompletiondir=/usr/share/bash-completion/completions