From patchwork Thu Dec 28 15:58:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Zheng Junjie X-Patchwork-Id: 58140 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 96FEF27BBE2; Thu, 28 Dec 2023 16:01:22 +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,URIBL_BLOCKED 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 CB17527BBE9 for ; Thu, 28 Dec 2023 16:01:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rIsol-0007B0-2x; Thu, 28 Dec 2023 11:01:07 -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 1rIsoh-0007Ac-7q for guix-patches@gnu.org; Thu, 28 Dec 2023 11:01:03 -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 1rIsoh-0006Fo-0F for guix-patches@gnu.org; Thu, 28 Dec 2023 11:01:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rIsof-0007vH-V8 for guix-patches@gnu.org; Thu, 28 Dec 2023 11:01:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68086] [PATCH] gnu: f3: Fix cross-compiling. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Dec 2023 16:01:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68086 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68086@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170377923327447 (code B ref -1); Thu, 28 Dec 2023 16:01:01 +0000 Received: (at submit) by debbugs.gnu.org; 28 Dec 2023 16:00:33 +0000 Received: from localhost ([127.0.0.1]:40203 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rIsoC-000750-5e for submit@debbugs.gnu.org; Thu, 28 Dec 2023 11:00:32 -0500 Received: from lists.gnu.org ([2001:470:142::17]:52704) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rIso6-0006lO-6k for submit@debbugs.gnu.org; Thu, 28 Dec 2023 11:00:29 -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 1rIso1-00071i-9h for guix-patches@gnu.org; Thu, 28 Dec 2023 11:00:21 -0500 Received: from smtp84.cstnet.cn ([159.226.251.84] helo=cstnet.cn) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1rIsnx-0005Ze-PC for guix-patches@gnu.org; Thu, 28 Dec 2023 11:00:21 -0500 Received: from localhost.localdomain (unknown [183.247.5.190]) by APP-05 (Coremail) with SMTP id zQCowABnSQ6Dm41lKlunAQ--.32152S2; Fri, 29 Dec 2023 00:00:05 +0800 (CST) From: Zheng Junjie Date: Thu, 28 Dec 2023 23:58:59 +0800 Message-ID: <757b3848f79aef293bf52454fb5b10f6a5b0f5a8.1703779139.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-CM-TRANSID: zQCowABnSQ6Dm41lKlunAQ--.32152S2 X-Coremail-Antispam: 1UD129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UjIYCTnIWjp_UUUY-7k0a2IF6F4UM7kC6x804xWl14x267AK xVWUJVW8JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGw A2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26r1j 6r1xM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r1j6r4UM28EF7xvwVC2z280aVAFwI0_Jr 0_Gr1l84ACjcxK6I8E87Iv6xkF7I0E14v26r1j6r4UM2AIxVAIcxkEcVAq07x20xvEncxI 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/ Received-SPF: pass client-ip=159.226.251.84; envelope-from=zhengjunjie@iscas.ac.cn; helo=cstnet.cn X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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/disk.scm (f3) [arguments]: Use Gexp. Change-Id: I906a2b7b7691ae53592cfa35ba64fc7e7d735664 --- gnu/packages/disk.scm | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) base-commit: bc509aba838780502b83f7fc3d2aee72903656f2 diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index 754c70897c..165f0a8a74 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -27,6 +27,7 @@ ;;; Copyright © 2022 Disseminate Dissent ;;; Copyright © 2023 Timotej Lazar ;;; Copyright © 2023 Morgan Smith +;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -843,18 +844,18 @@ (define-public f3 (base32 "17l5vspfcgfbkqg7bakp3gql29yb05gzawm8n3im30ilzdr53678")))) (build-system gnu-build-system) (arguments - `(#:tests? #f ; no check target - #:make-flags (list (string-append "CC=" ,(cc-for-target)) - (string-append "PREFIX=" %output)) - #:phases - (modify-phases %standard-phases - (delete 'configure) ; no configure script - (add-after 'build 'build-extra - (lambda* (#:key make-flags #:allow-other-keys) - (apply invoke "make" "extra" make-flags))) - (add-after 'build 'install-extra - (lambda* (#:key make-flags #:allow-other-keys) - (apply invoke "make" "install-extra" make-flags)))))) + (list #:tests? #f ; no check target + #:make-flags #~(list (string-append "CC=" #$(cc-for-target)) + (string-append "PREFIX=" #$output)) + #:phases + #~(modify-phases %standard-phases + (delete 'configure) ; no configure script + (add-after 'build 'build-extra + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "extra" make-flags))) + (add-after 'build 'install-extra + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "install-extra" make-flags)))))) (inputs (list eudev parted)) (home-page "http://oss.digirati.com.br/f3/")