From patchwork Tue Apr 9 18:12:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 1921569 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::136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=patchwork.ozlabs.org) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (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 4VDZ4z5spXz1yYT for ; Wed, 10 Apr 2024 04:20:19 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 4C79C605C0; Tue, 9 Apr 2024 18:20:17 +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 jTj31pegk7Ab; Tue, 9 Apr 2024 18:20:16 +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 smtp3.osuosl.org 3E936605D9 Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 3E936605D9; Tue, 9 Apr 2024 18:20:16 +0000 (UTC) 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 22C331BF584 for ; Tue, 9 Apr 2024 18:20:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 1A12A814B6 for ; Tue, 9 Apr 2024 18:20:14 +0000 (UTC) X-Virus-Scanned: amavis at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavis, port 10024) with ESMTP id qlDk8jKIMBn3 for ; Tue, 9 Apr 2024 18:20:12 +0000 (UTC) X-Greylist: delayed 469 seconds by postgrey-1.37 at util1.osuosl.org; Tue, 09 Apr 2024 18:20:12 UTC DMARC-Filter: OpenDMARC Filter v1.4.2 smtp1.osuosl.org 77B5781491 DKIM-Filter: OpenDKIM Filter v2.11.0 smtp1.osuosl.org 77B5781491 Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=89.234.176.197; helo=aposti.net; envelope-from=paul@crapouillou.net; receiver= Received: from aposti.net (aposti.net [89.234.176.197]) by smtp1.osuosl.org (Postfix) with ESMTPS id 77B5781491 for ; Tue, 9 Apr 2024 18:20:12 +0000 (UTC) From: Paul Cercueil To: buildroot@buildroot.org Date: Tue, 9 Apr 2024 20:12:14 +0200 Message-ID: <20240409181214.83567-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=1712686339; 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=52daU8O7AC8j68PaRYBbSIPpqr9IVPDELX/XwLH3giw=; b=ax6pHDLechiNJIHgNjFcFZf/TkHse0zCVG6d3GyYLxDIKP/tzxzLdpp8r60n39qAYfdqd/ ARVXs440+2qZBrr6/uTdNrvHrMj5oKBTQ+WgBqRuVfcuvuJkB+0mJyLAsrC60P83/bLAQB alWwPapOQKLKDXFq4fLQHiOWOp2Av2g= X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dmarc=pass (p=none dis=none) header.from=crapouillou.net X-Mailman-Original-Authentication-Results: smtp1.osuosl.org; dkim=pass (1024-bit key, unprotected) header.d=crapouillou.net header.i=@crapouillou.net header.a=rsa-sha256 header.s=mail header.b=ax6pHDLe Subject: [Buildroot] [PATCH] package/lightning: bump version to 2.2.3 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" Release notes: https://lists.gnu.org/archive/html/lightning/2024-02/msg00000.html Signed-off-by: Paul Cercueil --- .../0001-Fix-build-on-mips64el.patch | 65 ------------------- package/lightning/lightning.hash | 2 +- package/lightning/lightning.mk | 2 +- 3 files changed, 2 insertions(+), 67 deletions(-) delete mode 100644 package/lightning/0001-Fix-build-on-mips64el.patch diff --git a/package/lightning/0001-Fix-build-on-mips64el.patch b/package/lightning/0001-Fix-build-on-mips64el.patch deleted file mode 100644 index b3f087bb9e..0000000000 --- a/package/lightning/0001-Fix-build-on-mips64el.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 90f5c78f47dfb1ae4b953b0e30c7ef72a6438396 Mon Sep 17 00:00:00 2001 -From: Paul Cercueil -Date: Thu, 5 Oct 2023 14:24:13 +0200 -Subject: [PATCH] Fix build on mips64el - -The "cvt_offset" field may be used for anything non-ARM in -jit_fallback.c, so enable this field on anything non-ARM. Worst case -scenario, this field is not used and it only occupies 4 bytes of RAM. - -Besides, when building for mips64el with the N32 ABI, the __WORDSIZE -ends up being 32 and not 64 (which may be a problem in itself), which -caused some more issues as the movi_d_w() macro referenced by -jit_mips.c was not defined anywhere. - -This caused Buildroot's CI to fail when building on mips64el: -http://autobuild.buildroot.net/results/f951d91d2ca4647170a52499a243d45d13d3bced/ - -Upstream: http://git.savannah.gnu.org/cgit/lightning.git/commit/?id=90f5c78f47dfb1ae4b953b0e30c7ef72a6438396 -Signed-off-by: Paul Cercueil ---- - include/lightning/jit_private.h | 5 +---- - lib/lightning.c | 4 ++-- - 2 files changed, 3 insertions(+), 6 deletions(-) - -diff --git a/include/lightning/jit_private.h b/include/lightning/jit_private.h -index 5052a36..9f8caf6 100644 ---- a/include/lightning/jit_private.h -+++ b/include/lightning/jit_private.h -@@ -555,10 +555,7 @@ struct jit_function { - jit_int32_t *regoff; - jit_regset_t regset; - jit_int32_t stack; --#if defined(__i386__) || defined(__x86_64__) || \ -- defined(__powerpc__) || defined(__sparc__) || \ -- defined(__s390__) || defined(__s390x__) || \ -- defined(__hppa__) || defined(__alpha__) -+#if !defined(__arm__) - jit_int32_t cvt_offset; /* allocai'd offset for x87<->xmm or - * fpr<->gpr transfer using the stack */ - #endif -diff --git a/lib/lightning.c b/lib/lightning.c -index d5ea330..39c4fc2 100644 ---- a/lib/lightning.c -+++ b/lib/lightning.c -@@ -4285,7 +4285,7 @@ static void _htoni_ul(jit_state_t*, jit_int32_t, jit_word_t); - #endif - # define movi_f_w(r0, i0) _movi_f_w(_jit, r0, i0) - static void _movi_f_w(jit_state_t*, jit_int32_t, jit_float32_t); --#if __WORDSIZE == 32 -+#if __WORDSIZE == 32 && !(defined(__mips__) && NEW_ABI) - # define movi_d_ww(r0, r1, i0) _movi_d_ww(_jit, r0, r1, i0) - static void _movi_d_ww(jit_state_t*, jit_int32_t, jit_int32_t, jit_float64_t); - #else -@@ -4569,7 +4569,7 @@ _movi_f_w(jit_state_t *_jit, jit_int32_t r0, jit_float32_t i0) - movi(r0, data.i); - } - --#if __WORDSIZE == 32 -+#if __WORDSIZE == 32 && !(defined(__mips__) && NEW_ABI) - static void - _movi_d_ww(jit_state_t *_jit, jit_int32_t r0, jit_int32_t r1, jit_float64_t i0) - { --- -2.40.1 - diff --git a/package/lightning/lightning.hash b/package/lightning/lightning.hash index 6f7c24d19c..76ad5e4cda 100644 --- a/package/lightning/lightning.hash +++ b/package/lightning/lightning.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 0aca8242dead17d62117bcfcb078e6a9ea856cc81742813c9e8394bcce73b3e2 lightning-2.2.2.tar.gz +sha256 c045c7a33a00affbfeb11066fa502c03992e474a62ba95977aad06dbc14c6829 lightning-2.2.3.tar.gz sha256 a853c2ffec17057872340eee242ae4d96cbf2b520ae27d903e1b2fef1a5f9d1c COPYING.LESSER diff --git a/package/lightning/lightning.mk b/package/lightning/lightning.mk index c23ae9745e..08e388392c 100644 --- a/package/lightning/lightning.mk +++ b/package/lightning/lightning.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIGHTNING_VERSION = 2.2.2 +LIGHTNING_VERSION = 2.2.3 LIGHTNING_SITE = $(BR2_GNU_MIRROR)/lightning LIGHTNING_LICENSE = LGPL-3.0+ LIGHTNING_LICENSE_FILES = COPYING.LESSER