From patchwork Sat Dec 23 15:31:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Zheng Junjie X-Patchwork-Id: 58000 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 584FC27BBE9; Sat, 23 Dec 2023 15:33:24 +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=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable 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 3AFC327BBE2 for ; Sat, 23 Dec 2023 15:33:22 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rH3zp-0005Rk-9V; Sat, 23 Dec 2023 10:33:01 -0500 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 ) id 1rH3zl-0005Qp-Vr for guix-patches@gnu.org; Sat, 23 Dec 2023 10:32:57 -0500 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 ) id 1rH3zl-0000Dr-NL for guix-patches@gnu.org; Sat, 23 Dec 2023 10:32:57 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rH3zq-000097-UR for guix-patches@gnu.org; Sat, 23 Dec 2023 10:33:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67989] [PATCH 1/2] gnu: fzy: Use Gexps. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 23 Dec 2023 15:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67989 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67989@debbugs.gnu.org Received: via spool by 67989-submit@debbugs.gnu.org id=B67989.1703345544506 (code B ref 67989); Sat, 23 Dec 2023 15:33:02 +0000 Received: (at 67989) by debbugs.gnu.org; 23 Dec 2023 15:32:24 +0000 Received: from localhost ([127.0.0.1]:51081 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rH3zD-000080-NP for submit@debbugs.gnu.org; Sat, 23 Dec 2023 10:32:24 -0500 Received: from smtp21.cstnet.cn ([159.226.251.21]:50494 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rH3z9-00007X-OU for 67989@debbugs.gnu.org; Sat, 23 Dec 2023 10:32:22 -0500 Received: from localhost.localdomain (unknown [183.247.5.190]) by APP-01 (Coremail) with SMTP id qwCowABnb79w_IZlivpCAA--.49296S2; Sat, 23 Dec 2023 23:27:45 +0800 (CST) From: Zheng Junjie Date: Sat, 23 Dec 2023 23:31:35 +0800 Message-ID: <5b2f8781abc7bedb2cab43fb56a432c9b6d7ddcd.1703337758.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-CM-TRANSID: qwCowABnb79w_IZlivpCAA--.49296S2 X-Coremail-Antispam: 1UD129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UjIYCTnIWjp_UUUY-7k0a2IF6F4UM7kC6x804xWl14x267AK xVWUJVW8JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGw A2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26r1I 6r4UM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r1j6r4UM28EF7xvwVC2z280aVAFwI0_Gc CE3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxI r21le4C262xC7I0v67AEwI8IwI1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20x vE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xv r2IYc2Ij64vIr41lw4CEx2IqxVAFz4v204v26I0v724l42xK82IYc2Ij64vIr41l4I8I3I 0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWU JVWUGwC2zVAF1VAY17CE14v26r1j6r15MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI 0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r1j6r4UMIIF0xvE42xK8VAvwI8IcIk0 rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r1j6r 4UYxBIdaVFxhVjvjDU0xZFpf9x07jeXdbUUUUU= X-Originating-IP: [183.247.5.190] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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 * gnu/packages/shellutils.scm (fzy)[arguments]: Use Gexps. Change-Id: Ic9e929ce3e85ec07f44ae7f8597a02a64edd5bf5 --- gnu/packages/shellutils.scm | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index f010a50538..a5c4f27aa6 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -17,6 +17,7 @@ ;;; Copyright © 2022 Jose G Perez Taveras ;;; Copyright © 2023 Timo Wilken ;;; Copyright © 2023 Camilo Q.S. (Distopico) +;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -552,11 +553,12 @@ (define-public fzy "1gkzdvj73f71388jvym47075l9zw61v6l8wdv2lnc0mns6dxig0k")))) (build-system gnu-build-system) (arguments - '(#:make-flags (list "CC=gcc" - (string-append "PREFIX=" (assoc-ref %outputs "out"))) - #:phases - (modify-phases %standard-phases - (delete 'configure)))) + (list #:make-flags + #~(list "CC=gcc" + (string-append "PREFIX=" #$output)) + #:phases + #~(modify-phases %standard-phases + (delete 'configure)))) (home-page "https://github.com/jhawthorn/fzy") (synopsis "Fast fuzzy text selector for the terminal with an advanced scoring algorithm") From patchwork Sat Dec 23 15:31:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Junjie X-Patchwork-Id: 58001 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A6B6427BBEA; Sat, 23 Dec 2023 15:33:25 +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=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS 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 2939827BBE2 for ; Sat, 23 Dec 2023 15:33:25 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rH3zn-0005RL-QK; Sat, 23 Dec 2023 10:32:59 -0500 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 ) id 1rH3zl-0005Qh-HE for guix-patches@gnu.org; Sat, 23 Dec 2023 10:32:57 -0500 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 ) id 1rH3zl-0000Dl-5y for guix-patches@gnu.org; Sat, 23 Dec 2023 10:32:57 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rH3zq-000090-DX for guix-patches@gnu.org; Sat, 23 Dec 2023 10:33:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67989] [PATCH 2/2] gnu: fzy: Fix cross-compilation. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 23 Dec 2023 15:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67989 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67989@debbugs.gnu.org Received: via spool by 67989-submit@debbugs.gnu.org id=B67989.1703345543499 (code B ref 67989); Sat, 23 Dec 2023 15:33:02 +0000 Received: (at 67989) by debbugs.gnu.org; 23 Dec 2023 15:32:23 +0000 Received: from localhost ([127.0.0.1]:51079 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rH3zD-00007y-Dn for submit@debbugs.gnu.org; Sat, 23 Dec 2023 10:32:23 -0500 Received: from smtp21.cstnet.cn ([159.226.251.21]:50496 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rH3z9-00007W-OV for 67989@debbugs.gnu.org; Sat, 23 Dec 2023 10:32:21 -0500 Received: from localhost.localdomain (unknown [183.247.5.190]) by APP-01 (Coremail) with SMTP id qwCowABnb79w_IZlivpCAA--.49296S3; Sat, 23 Dec 2023 23:27:45 +0800 (CST) From: Zheng Junjie Date: Sat, 23 Dec 2023 23:31:36 +0800 Message-ID: <8542c371700f481ff86f9e0e0db36ca637cd981b.1703337758.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-CM-TRANSID: qwCowABnb79w_IZlivpCAA--.49296S3 X-Coremail-Antispam: 1UD129KBjvdXoWruFy5Wr18Jr47tr1xCw1Utrb_yoWxtrg_uF ZrJr4Sqrs7Ww1jkwn8C3WvkF15tFn7ZFy7Ka1xtrn2qrZxWFnIqFWDury7A3WrtF40qFnY kayvgr15Xr1I9jkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbVAYjsxI4VW3JwAYFVCjjxCrM7AC8VAFwI0_Jr0_Gr1l1xkIjI8I 6I8E6xAIw20EY4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l82xGYIkIc2x26280x7 IE14v26r18M28IrcIa0xkI8VCY1x0267AKxVWUGwA2ocxC64kIII0Yj41l84x0c7CEw4AK 67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26r1I6r4UM28EF7xvwVC0I7IYx2IY6xkF7I 0E14v26r1j6r4UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E 14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7 xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Y z7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7 v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF 1VAY17CE14v26r1j6r15MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIx AIcVC0I7IYx2IY6xkF7I0E14v26r1j6r4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI 42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r1j6r4UYxBIdaVFxh VjvjDU0xZFpf9x07jrHUDUUUUU= X-Originating-IP: [183.247.5.190] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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 * gnu/packages/shellutils.scm (fzy)[arguments]: Use cc-for-target. Change-Id: Ic9e929ce3e85ec07f44ae7f8597a02a64edd5bf5 --- gnu/packages/shellutils.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/shellutils.scm b/gnu/packages/shellutils.scm index a5c4f27aa6..9993c0b807 100644 --- a/gnu/packages/shellutils.scm +++ b/gnu/packages/shellutils.scm @@ -554,7 +554,7 @@ (define-public fzy (build-system gnu-build-system) (arguments (list #:make-flags - #~(list "CC=gcc" + #~(list (string-append "CC=" #$(cc-for-target)) (string-append "PREFIX=" #$output)) #:phases #~(modify-phases %standard-phases