From patchwork Tue Jul 25 07:45:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Z572 <873216071@qq.com> X-Patchwork-Id: 52182 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 2FBA127BBE9; Tue, 25 Jul 2023 08:47:56 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,FREEMAIL_REPLYTO_END_DIGIT, 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 D50A827BBE2 for ; Tue, 25 Jul 2023 08:47:53 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qOClg-0002l0-Ib; Tue, 25 Jul 2023 03:47:40 -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 ) id 1qOCl8-0002if-Fz for guix-patches@gnu.org; Tue, 25 Jul 2023 03:47:10 -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 ) id 1qOCl7-0002MZ-G2; Tue, 25 Jul 2023 03:47:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qOCl4-0001m6-Au; Tue, 25 Jul 2023 03:47:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64845] [PATCH] gnu: fcode-utils: Fix cross-compilation. Resent-From: Zheng Junjie <873216071@qq.com> Original-Sender: "Debbugs-submit" Resent-CC: efraim@flashner.co.il, ludo@gnu.org, vagrant@debian.org, guix-patches@gnu.org Resent-Date: Tue, 25 Jul 2023 07:47:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 64845 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64845@debbugs.gnu.org Cc: Efraim Flashner , Ludovic Court?s , Vagrant Cascadian X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Efraim Flashner , Ludovic Court?s , Vagrant Cascadian Received: via spool by submit@debbugs.gnu.org id=B.16902711666752 (code B ref -1); Tue, 25 Jul 2023 07:47:02 +0000 Received: (at submit) by debbugs.gnu.org; 25 Jul 2023 07:46:06 +0000 Received: from localhost ([127.0.0.1]:44581 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qOCk7-0001km-SQ for submit@debbugs.gnu.org; Tue, 25 Jul 2023 03:46:06 -0400 Received: from lists.gnu.org ([2001:470:142::17]:58754) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <873216071@qq.com>) id 1qOCk2-0001jv-DL for submit@debbugs.gnu.org; Tue, 25 Jul 2023 03:46:02 -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 <873216071@qq.com>) id 1qOCjq-0002a9-MV for guix-patches@gnu.org; Tue, 25 Jul 2023 03:45:52 -0400 Received: from out203-205-221-210.mail.qq.com ([203.205.221.210]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <873216071@qq.com>) id 1qOCjk-0002EN-JZ for guix-patches@gnu.org; Tue, 25 Jul 2023 03:45:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1690271124; bh=FkCJimj3rKroq8j0mwUDejtait+4nB92O8B0MUYGc7o=; h=From:To:Subject:Date; b=nXcYI651O4gTrm39F5gra3tXSx0r93ixwGuKwOJ63Nc3UgotC4vosjq3e+DX+/DlM 62yrXr5Fj7+nCOcTSTIMFVURqfz/2XWzwIXPvlILFykzGEE99KhZyKTBeA5IM115/s i9fy1uxi9bm4LzjufQZ71Nyu+7JFTa0N+AAKutgA= Received: from localhost.localdomain ([111.0.51.236]) by newxmesmtplogicsvrszc5-0.qq.com (NewEsmtp) with SMTP id B56B06C5; Tue, 25 Jul 2023 15:45:22 +0800 X-QQ-mid: xmsmtpt1690271122tjncjbp9h Message-ID: X-QQ-XMAILINFO: OZZSS56D9fAj5iyT2f+VspC199JnWbCfeh+/IB7ZSOGRSGESrc9k4B9KcBV4Ro H7LT9ldLCcWeL0vA3Q6mZNpWgSKIQxfn4eQ48iFFjGvXndbzkWg2LN6SCC2QAUFBB/3lKWkO9IO6 DOAD6XkPn22c5HCyWiSo/FdYaDRrYuzliXs0sVPYhl9jBmZEJN4tELoqP1n+vMlKp8+8pQYajRkZ TXFPyHce2nCdNm/LoIV1mu91KAH9wMykTq/4ONcBNyXvjaKcqhYLsEJOunpi31exwbHkkUo8UA5R v7dcLsuFPN9IVOB0xSLzwAfw+/78DGzWAyxErfVGkF2jtZe736rCyGjgypbx1C8SdHla2KPbZUNK vML53RwhVcVAx958SVTzxyH3vWvG+VGSpA6G98r05fixnaJcOCMEoxS30Sma+rcuVwKM8zEor28U bmZMJrLOYAFYUOCXY2iebUssHzgQX1Jf7YevuM1Gvlbcd+8qEK+Ln6ak+ZnnDezDVlmJimEn/tG0 LNhzCOTma4jdfYanLB7sMzXGnZwTmVCJU+8L3/Kiu860Eg/KHhg+mF5lZvZCplcOYwjnt33j3yro w7uQd0Of/DSzJsWY06H59i133CJE9IMAjRYTgbRu527gndfXeV/1ko0JMWkW9+uDu1q0jtLBUpgZ fEV/tGFx3OB1cCBlM2XidT9m//azP/GHhXqew0A1eNQxXmzCtpjjlJyeSfik22S40uKduM9H0B07 F8uMb5ViVcR4vd9B7SznWQt8btzMmclTSEIS+vdbgQtZlEpHJxeavJ7EEJNEJUqeHd4aFiZT5P4p 10BIBtIaqqIH4KYmEfvs0ZW8VkELG+WMqS/dVQTIkxRLi3A7KGfmhPm2Xew/3PqnxD1Ok+IXyQAP ccBdEbe2K1s+8G2XSTUsPFZ+inN1jgqiSpcQYNd7z13CKf6EN4hw9TxjOJP/Nv2YIJtrpu++CXld wKhrlxjZvhdBVVAZF0U3sgJL39Ih87 X-QQ-XMRINFO: M/715EihBoGSf6IYSX1iLFg= Date: Tue, 25 Jul 2023 15:45:13 +0800 X-OQ-MSGID: <4ad10ff14c055b88994d92d3b84063a796e43f46.1690271113.git.873216071@qq.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=203.205.221.210; envelope-from=873216071@qq.com; helo=out203-205-221-210.mail.qq.com X-Spam_score_int: 11 X-Spam_score: 1.1 X-Spam_bar: + X-Spam_report: (1.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, HELO_DYNAMIC_IPADDR=1.951, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_DYNAMIC=0.982, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no 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: , Reply-to: Zheng Junjie <873216071@qq.com> X-ACL-Warn: , Zheng Junjie via Guix-patches X-Patchwork-Original-From: Zheng Junjie via Guix-patches via From: Z572 <873216071@qq.com> 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/firmware.scm (fcode-utils) [arguments]: add remove-makefile-strip phase. --- gnu/packages/firmware.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) base-commit: 76e041f9eef85bb039c5251d3350c62ee2066883 diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 35d3100ac6..01565ed18a 100644 --- a/gnu/packages/firmware.scm +++ b/gnu/packages/firmware.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2020, 2021, 2022 Marius Bakke ;;; Copyright © 2021 Petr Hodina ;;; Copyright © 2022, 2023 Maxim Cournoyer +;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -387,7 +388,14 @@ (define-public fcode-utils (string-append "DESTDIR=" #$output)) #:phases #~(modify-phases %standard-phases - (delete 'configure)))) ; No configure script. + (delete 'configure) ; No configure script. + (add-after 'unpack 'remove-makefile-strip + (lambda _ + (substitute* '("detok/Makefile" + "romheaders/Makefile" + "toke/Makefile") + (("\\$\\(STRIP\\).*") + ""))))))) (native-inputs (list tcsh)) (home-page "https://www.openfirmware.info/FCODE_suite")