From patchwork Wed Jul 26 06:03:31 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: 52187 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 3E38F27BBE9; Wed, 26 Jul 2023 07:04:26 +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 5D75527BBE2 for ; Wed, 26 Jul 2023 07:04:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qOXd1-0006pq-66; Wed, 26 Jul 2023 02:04:07 -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 1qOXcx-0006o9-Pr for guix-patches@gnu.org; Wed, 26 Jul 2023 02:04:04 -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 1qOXcw-0005SC-SG; Wed, 26 Jul 2023 02:04:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qOXcv-0002AE-Vr; Wed, 26 Jul 2023 02:04:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64845] [PATCH v2] gnu: fcode-utils: Fix cross-compilation. References: In-Reply-To: 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: Wed, 26 Jul 2023 06:04:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 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-Xcc: Efraim Flashner , Ludovic Court?s , Vagrant Cascadian Received: via spool by 64845-submit@debbugs.gnu.org id=B64845.16903514418311 (code B ref 64845); Wed, 26 Jul 2023 06:04:01 +0000 Received: (at 64845) by debbugs.gnu.org; 26 Jul 2023 06:04:01 +0000 Received: from localhost ([127.0.0.1]:47434 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qOXcv-00029z-1H for submit@debbugs.gnu.org; Wed, 26 Jul 2023 02:04:01 -0400 Received: from out203-205-221-210.mail.qq.com ([203.205.221.210]:52566) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <873216071@qq.com>) id 1qOXcq-00029g-N3 for 64845@debbugs.gnu.org; Wed, 26 Jul 2023 02:03:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1690351423; bh=utKlnjOJUeAA0sbFoa17QP8xfQdkew1NSjHYVlsvDA0=; h=From:To:Subject:Date; b=dgL4rpmzXZh81lqJwIkNfqdcBddCjnJpIRj0DmGZ481oey0fKwBXJ51oNvcmcgq3n lWvMYdWyLPVDBwecMFUJZ8sb6/Uv3hHcIZ877rSU4jRPf59T6IjwCF7P5M/TgdG23+ cPpY/ISkycQdcKZoHAuc7Guj394pl/+pNUuBRN1c= Received: from localhost.localdomain ([111.0.51.236]) by newxmesmtplogicsvrszc5-0.qq.com (NewEsmtp) with SMTP id E98C208; Wed, 26 Jul 2023 14:03:41 +0800 X-QQ-mid: xmsmtpt1690351421toz7l6gnl Message-ID: X-QQ-XMAILINFO: MmpliBmRb3iCrCXYMV4GHEIy0Q4SoZ9MmmsoFx4KcI9x2fxGnZ6ClZRNy79oJ7 EjQahlJv5AB/lXzOrwOV12HQ555V2FBfhM58mRzBu3dbAVTzso8DY59PCw6SK8G9X/92nO7gXaq3 /jSpSRE+6i1swVYKSkdHl3ut2g8T4qsCmSiEsEPZmz5O7TWb8RZNo0eLMrjxO1bP/A6g/PpB+WSl N01qrzFcdo7iUmvxHo9zMl9069iYvhq2pM5DD0H24bLK2ScyXusJ/sQSlVZAFDj7NTK/n+mHEnJ1 701VvKBJlc67MrkxNL7rZl67KW7upYAFs2MJ2fBB/3UI5q4zvAH8/6O9RPyDMOfb1LuvfbycU7Pi 1+WJVhlzZJHYdawekw5bIJ7Hnd886h0rqJFUpn65mHOSKo2Vi87GY+r+C88h/NIiA5AiWWWLU4Af n+0wD5pvLWW5d45eaQh+v2cJz6pdIWv3C26qeEmAUTX2LiYtYoI28Oiq/Ql2xu+sJbs8UlPZr9zF NgryuLm3Q7eal4i7QmJUm9ssaNFEnp4+sXYrbCt7JIjDPUP4g1lPO2zXC6rP2DUjc8DO0vGX40AX GRorIzXDyz1GebMZlGo8/4qTBXT2hzYHzv8FGC2+3t3WaKAiI4/UYQGPi3J3NnLElaHafrOkiewr uyaqxkxu3ETcpZ3cggqOZGnyXrC4m6kDJepGoMgjWUHNUC3CHMV9Mr4ygEmsoqnt1ROQoLMi9Mzi JTBv/bkp6kK/uYWiBWKQUUm0tDisFjjk4awKAngnR6G+HsneIt5ie3+eo7LNeDFFL2DTXkKgHza/ f7EFYpAYpoqCmZM5xVq5FiDQDIKN+7puvww8x8GCYipW1VpQj4tPvOi6k3wo7/iRVM9C4O/B0nzj TY0/F9kYgXaAABuD1sfKg30RnGiKLMokT8ua86XtO9GedpEmY9iSvdRItQX7Fz7HQGi283lMkzU4 kIOqwOR5zuSIpQOW8qcWeF/e+Gzlgy X-QQ-XMRINFO: Mp0Kj//9VHAxr69bL5MkOOs= Date: Wed, 26 Jul 2023 14:03:31 +0800 X-OQ-MSGID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 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 | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) base-commit: 76e041f9eef85bb039c5251d3350c62ee2066883 diff --git a/gnu/packages/firmware.scm b/gnu/packages/firmware.scm index 35d3100ac6..ba8d462af9 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,16 @@ (define-public fcode-utils (string-append "DESTDIR=" #$output)) #:phases #~(modify-phases %standard-phases - (delete 'configure)))) ; No configure script. + (delete 'configure) ; No configure script. + ;; makefile will invoke `strip', it break cross-compile, + ;; and we have 'strip phase handled it , so remove it from makefile. + (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")