Message ID | 87bju717th.fsf@wireframe |
---|---|
State | New |
Headers |
Return-Path: <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org> X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CC9E727BBEA; Tue, 11 Mar 2025 23:12:38 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1EB4227BBE2 for <patchwork@mira.cbaines.net>; Tue, 11 Mar 2025 23:12:38 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <guix-patches-bounces@gnu.org>) id 1ts8lc-0002Ns-91; Tue, 11 Mar 2025 19:12:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1ts8lZ-0002NM-7A for guix-patches@gnu.org; Tue, 11 Mar 2025 19:12:05 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1ts8lY-0003uD-No for guix-patches@gnu.org; Tue, 11 Mar 2025 19:12:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:References:In-Reply-To:From:To:Subject; bh=ucG12OJHQbqFg/Ckw+ufe2uUcW8cbXPLJnK6Yef/ACQ=; b=iOErdLvjwfcnNtI9wny38FxmLd5uWvHBLXY8exmbDG359nt6QSdXXwuX4AVX7zCwBxCiw3fc8nucjh5EohRxESlMdTlkrexqXJ0OceUqiBWmcDkLTNElp3Wji6NMv+LGjDBuUbiRsuebI/jEOWLSj8keIrVuUMnIauJi/UIsJMCF0mxrmqEx7ZxWXwkn/Su86S0PgK+hplz2hLLPm37+pw1yP6aFRNldgxLtiBbRX2BhXfAKit6Y9JUg6ItOE8RqS0Sj+b2+e6TlUqI2qdWBJepAxmrn2ja8xeX+2NVwojyorlXq6gsic3JE/QUkYaRHnGiM3hrmQsiVMKC1BCy9Iw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1ts8lW-0000IT-Hf for guix-patches@gnu.org; Tue, 11 Mar 2025 19:12:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#76770] [PATCH] gnu: lua: compile with readline support Resent-From: Vagrant Cascadian <vagrant@debian.org> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org> Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 11 Mar 2025 23:12:02 +0000 Resent-Message-ID: <handler.76770.B76770.17417347181130@debbugs.gnu.org> Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76770 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: kimapr <kimapr@mail.ru>, 76770@debbugs.gnu.org Received: via spool by 76770-submit@debbugs.gnu.org id=B76770.17417347181130 (code B ref 76770); Tue, 11 Mar 2025 23:12:02 +0000 Received: (at 76770) by debbugs.gnu.org; 11 Mar 2025 23:11:58 +0000 Received: from localhost ([127.0.0.1]:46261 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1ts8lS-0000IA-4i for submit@debbugs.gnu.org; Tue, 11 Mar 2025 19:11:58 -0400 Received: from cascadia.aikidev.net ([173.255.214.101]:33116) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from <vagrant@debian.org>) id 1ts8lO-0000Hu-V1 for 76770@debbugs.gnu.org; Tue, 11 Mar 2025 19:11:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=debian.org; s=1.vagrant.user; t=1741734705; bh=K/FxcxR5A+GeavTzFcac2uNuoeKwE7Iw/8cV7lVZ1+w=; h=From:To:Subject:In-Reply-To:References:Date:From; b=dwTsvgx3SNMTiYz4Io5DOZQEmddlesTE0rZfYvYtFiTEOi4eVcOClJBDQjLjvhNrp noC4Nq6/TUfwhArhhGKCPlC+RXqOvNV4mcNKG52jznyjhP1aOx3uvB/SszbHePPbE4 wEAtpJd7vfk/Rf7Hce9nKP5/Qj9LSkgoUfZWYOMRmeeM0EjHIAQCl0mwegtUpjofQr 3sf/Fc67BiFWQCHseLrHttwlCjrDI7YWO4ISC9oCezFvmdb+myRgzwGspBHKDyQDhn Wm90Liqr8VoH4L411PB1EUf2K23Sw0AETyu9nSiuViBtQsiy/s8Q6hsLTG3+yB2zj3 +IP43OmC/2+pQ== Received: from localhost (unknown [IPv6:2600:3c01:e000:21:7:77:0:50]) by cascadia.aikidev.net (Postfix) with ESMTPSA id 368CF30CC; Tue, 11 Mar 2025 16:11:45 -0700 (PDT) From: Vagrant Cascadian <vagrant@debian.org> In-Reply-To: <4c7e55c4-9457-47c9-a90a-eb6c0fe4e430@mail.ru> References: <c6f7f6d3-6c9b-4862-ae9e-0357218082ab@mail.ru> <87h64033mv.fsf@wireframe> <87ecz431ez.fsf@wireframe> <4c7e55c4-9457-47c9-a90a-eb6c0fe4e430@mail.ru> Date: Tue, 11 Mar 2025 16:11:38 -0700 Message-ID: <87bju717th.fsf@wireframe> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: <guix-patches.gnu.org> List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=unsubscribe> List-Archive: <https://lists.gnu.org/archive/html/guix-patches> List-Post: <mailto:guix-patches@gnu.org> List-Help: <mailto:guix-patches-request@gnu.org?subject=help> List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=subscribe> Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches |
Series |
[bug#76770] gnu: lua: compile with readline support
|
|
Commit Message
Vagrant Cascadian
March 11, 2025, 11:11 p.m. UTC
On 2025-03-11, kimapr wrote: > On 2025/03/11 04:34, Vagrant Cascadian wrote: >> So the patch needs to be re-worked ot only apply to lua-5.4. But then >> should be able to be pushed directly as it does not have many >> dependents. > > I have done this, however my email client is very evil and keeps > messing up my formatting no matter what I try so sending the patch > without malforming it proves difficult. (word-wrapping, randomly > deleting spaces, i thought i disabled the former but it's still doing > it and the latter simply makes no sense in any context) In the future you could also submit the patch as an attachment generated with "git format-patch"? I should hope your client doesn't mangle attachements! > This is a problem to solve later (by using a different client), for > now I will just send the patch in base64 instead to protect it against > my evil email client: Nice workaround! :) For completeness, I have attached the version decoded from base64... And Also tested that it builds it's dependents: $ ./pre-inst-env guix build --keep-going --max-jobs=2 --dependents lua guix build: computing dependents of package lua@5.4.6... /gnu/store/sv4q1qms1mahs7vsxpk83n62sgilvsnd-lua-5.4.6 /gnu/store/95iazlx13k0mvr63qyxn0y87fiyg7s0x-wesnoth-server-1.18.3 /gnu/store/jifrzb3pd084sd4zjlpypiyznykxpx89-wesnoth-1.18.3 /gnu/store/a91sbgmhr4gfw843rckzcpzxi7ahz3kn-darktable-5.0.1 /gnu/store/qpf4nryf3pjwq31x5kp2n70s0j4kzi47-lite-xl-2.1.3 I tested that it does not trigger rebuilds of other lua versions, and does enable readline support on lua@5.4 ... so it works! I am not sure I fully wrap my head around the guile code used to accomplish this, but that is likely just me... so someone a little more savvy should still review that bit... live well, vagrant
Comments
On 2025-03-11, Vagrant Cascadian wrote: > On 2025-03-11, kimapr wrote: >> On 2025/03/11 04:34, Vagrant Cascadian wrote: >>> So the patch needs to be re-worked ot only apply to lua-5.4. But then >>> should be able to be pushed directly as it does not have many >>> dependents. ... > From 02d15b2a9d59354c2f53605278bf5eea074b9a4e Mon Sep 17 00:00:00 2001 > From: Kimapr <kimapr@mail.ru> > Date: Tue, 11 Mar 2025 11:43:34 +0500 > Subject: [PATCH] gnu: lua-5.4: compile with readline support > > * gnu/packages/lua.scm (lua-5.4)[arguments]: change target to > "linux-readline". > --- > gnu/packages/lua.scm | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm > index 4c65bcbf12..0e45af12a2 100644 > --- a/gnu/packages/lua.scm > +++ b/gnu/packages/lua.scm > @@ -134,6 +134,12 @@ (define-public lua > (define-public lua-5.4 > (package (inherit lua) > (version "5.4.6") > + (arguments > + (substitute-keyword-arguments (package-arguments lua) > + ((#:make-flags flags) > + (append (list-head flags > + (- (length flags) 1)) > + '("linux-readline"))))) I guess this could stand to use a comment in the code explaining what it is doing and why. I *think* I understand what it is doing... but that is largely guessing on my part. :) This does make it a little fragile if the ordering of the #:make-flags on the inherited package change or have new values appended. live well, vagrant
Hello, Am Tue, Mar 11, 2025 at 05:11:04PM -0700 schrieb Vagrant Cascadian: > > + (append (list-head flags > > + (- (length flags) 1)) > > + '("linux-readline"))))) Maybe you could replace (list-head flags (- (length flags) 1)) by (delete "linux" flags) (or delq or delv, I do not memorise the different ways of comparing in Guile)? Andreas
On 2025-04-03, Andreas Enge wrote: > Am Tue, Mar 11, 2025 at 05:11:04PM -0700 schrieb Vagrant Cascadian: >> > + (append (list-head flags >> > + (- (length flags) 1)) >> > + '("linux-readline"))))) > > Maybe you could replace > (list-head flags (- (length flags) 1)) > by > (delete "linux" flags) Nice suggestion, worked for me! $ ./pre-inst-env guix build --max-jobs=2 --dependents lua@5.4 guix build: computing dependents of package lua@5.4.6... /gnu/store/5y1yakxlfni97f97jnps87agbplzpy5i-lua-5.4.6 /gnu/store/i5izv9867afhnj5hissfcrp368yg6cgi-wesnoth-1.18.3 /gnu/store/gk86kl9ba2anmgn3c4b9jmdbx0wh0gy1-wesnoth-server-1.18.3 /gnu/store/79n34573x0kzddw75fma59x0mjag5lmq-darktable-5.0.1 /gnu/store/c7b6a1zrcv88vbrvxl6gn6srfv6waqrx-lite-xl-2.1.3 Pushed as 538fc4917f55cb2ab0b7c090de00855fa421db69. Hopefully my use of Suggested-by/Modified-by make sense there! live well, vagrant
From 02d15b2a9d59354c2f53605278bf5eea074b9a4e Mon Sep 17 00:00:00 2001 From: Kimapr <kimapr@mail.ru> Date: Tue, 11 Mar 2025 11:43:34 +0500 Subject: [PATCH] gnu: lua-5.4: compile with readline support * gnu/packages/lua.scm (lua-5.4)[arguments]: change target to "linux-readline". --- gnu/packages/lua.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 4c65bcbf12..0e45af12a2 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm @@ -134,6 +134,12 @@ (define-public lua (define-public lua-5.4 (package (inherit lua) (version "5.4.6") + (arguments + (substitute-keyword-arguments (package-arguments lua) + ((#:make-flags flags) + (append (list-head flags + (- (length flags) 1)) + '("linux-readline"))))) (source (origin (method url-fetch) (uri (string-append "https://www.lua.org/ftp/lua-" base-commit: 1b7fb5e3f97271ed4264dc9eed7bbc286e9635a3 -- 2.39.5