From patchwork Sat Mar 25 04:50:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Z572 <873216071@qq.com> X-Patchwork-Id: 48661 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 9F17D17010; Sat, 25 Mar 2023 04:52:21 +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=-1.5 required=5.0 tests=DKIM_INVALID,DKIM_SIGNED, FREEMAIL_FROM,FREEMAIL_REPLYTO_END_DIGIT,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 E83B016934 for ; Sat, 25 Mar 2023 04:52:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pfvsw-0003Xt-6W; Sat, 25 Mar 2023 00:52:10 -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 1pfvss-0003X9-89 for guix-patches@gnu.org; Sat, 25 Mar 2023 00:52:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pfvsq-0006uC-Vm for guix-patches@gnu.org; Sat, 25 Mar 2023 00:52:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pfvso-0008Kb-G7 for guix-patches@gnu.org; Sat, 25 Mar 2023 00:52:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62432] [PATCH] gnu: libicns: fix riscv64 cross-build. Resent-From: Z572 <873216071@qq.com> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 Mar 2023 04:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62432 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62432@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167971990031982 (code B ref -1); Sat, 25 Mar 2023 04:52:02 +0000 Received: (at submit) by debbugs.gnu.org; 25 Mar 2023 04:51:40 +0000 Received: from localhost ([127.0.0.1]:41840 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pfvsO-0008Ji-Es for submit@debbugs.gnu.org; Sat, 25 Mar 2023 00:51:40 -0400 Received: from lists.gnu.org ([209.51.188.17]:35998) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <873216071@qq.com>) id 1pfvsG-0008JP-9R for submit@debbugs.gnu.org; Sat, 25 Mar 2023 00:51:34 -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 1pfvsD-0003VO-Ku for guix-patches@gnu.org; Sat, 25 Mar 2023 00:51:25 -0400 Received: from out203-205-251-36.mail.qq.com ([203.205.251.36]) 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 1pfvs6-0006g0-Rz for guix-patches@gnu.org; Sat, 25 Mar 2023 00:51:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1679719865; bh=UKJKYUdMMzf6XB86wr14ZIkWwwMyFYoNqBUUlobVf+Q=; h=From:To:Subject:Date; b=MFO8tqujj/5dMu9EwPR9nJJTTSKyzx8aIMXxQhTJnREsY5FsYofOJohMVUaX05FcU xpHCeg6SNTnRq/q93/i+cnl9QsjFCHydGm/kiT0Ejh2SPV9Tvlbgo31hjd7lYbhlXx AVYpzOnyR4ems02vhWbTKDOl1mC37LT38WnD3Yg8= Received: from localhost.localdomain ([112.10.199.221]) by newxmesmtplogicsvrszc1-0.qq.com (NewEsmtp) with SMTP id CC128AD5; Sat, 25 Mar 2023 12:51:01 +0800 X-QQ-mid: xmsmtpt1679719861tf9jd6wxu Message-ID: X-QQ-XMAILINFO: NyTsQ4JOu2J2lsk/Qe7oI39TB05kBVk5bIrBh+Z7VWfpQOjNBkDIO9aoINm67S KG6zLk7d3ZYRVBBYKoTvPKreAVoEJSmbbxEAIfUoGmxFrGBr5mg1gxZVWlXpY4GqVtj9iUWtfr/w FS9eGnpxW6K/R/D7U2zmux8+VWhk63zdPeCc/wl1VFe5VPKM4zMDMDUwY6PtukJxd9Eddsqk+AP9 xInJIriLI4/JMMS5I4sbsMS9ClfV0AENt9uzV3t26QX7KX+TBPo33eJrE/J9bMhTnu4ZeXOKXVbz 5IfRWutTWu6ZIlhoxfTz18bBnyTR0hJRbDBAPb20WzXk1uV2fTS+4vwU9LFj5uadEKE4IQGb9LGc 9+zO2yWdVGnN55IUWxeLpDaD9AgO5OAgQ7BvMyV5wG2wCBbLxTxE/9vhoP2lRjAQzYnIisCqbvNr 2/AGJE0sDd57Ju4vPwtKyJcjM6EqYc2Bs680VVDT9mp2gX7Sb8pOblRRYMg/r/T0ftM2xIpmOS/o 5cYNXPLyYo3ktGsWFYEqpOBggPpncxI3GJROBi5oNN/KJ85DFec4FUSnTNewPDO/YmjuGd0XsNay l94QFb4t0CwQfynwTdlDWe0gizHnrvqIBRJecSDakPNAcY9CAcnlcoJXP7/bP/b5CB6e/HAeRY7P eWrU95EVVEgPrUrwy80SICp467IfIhgLJACsovMh/EJsgJIeJQEzjn/aNOQrxo0hTR/8zkllsR/a guOIZBZ72TvXanPmIj2mxMZ6XbocRP8D01tLChjAN6rWhHRwPx2ZQeumpf+8T4Hket72d0M0G5dh ZbhbkGVuvsbZL+9kk9GrS5jsOrDcp5KKzWFw3r4hVd9VplA3frcJmwY0NqHgzKefaZ6Ssn7Xb3/F jjseEkGHST+BwMBXM95huCTzSa0mIuJH9NDEoWo+Zbk0SePnQFU65ZpSnJctdI2eN223MCJyKw Date: Sat, 25 Mar 2023 12:50:59 +0800 X-OQ-MSGID: <6bf44039a4682c178b5d84750cfd68dfc579f02f.1679719815.git.873216071@qq.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Received-SPF: pass client-ip=203.205.251.36; envelope-from=873216071@qq.com; helo=out203-205-251-36.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 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: Z572 <873216071@qq.com> X-ACL-Warn: , Z572 via Guix-patches X-Patchwork-Original-From: Z572 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/image.scm (libicns): fix riscv64 cross-build. [arguments]: when target-riscv64, add phase to update-config-scripts [native-inputs]: when target-riscv64, add config. --- gnu/packages/image.scm | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 0da990e63a..81cdcd778e 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -549,6 +549,22 @@ (define-public libicns (base32 "1hjm8lwap7bjyyxsyi94fh5817xzqhk4kb5y0b7mb6675xw10prk")))) (build-system gnu-build-system) + (arguments (if (target-riscv64?) + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'update-config-scripts + (lambda* (#:key native-inputs inputs #:allow-other-keys) + (for-each (lambda (file) + (install-file + (search-input-file + (or native-inputs inputs) + (string-append "/bin/" file)) ".")) + '("config.guess" "config.sub"))))) ) + '())) + (native-inputs + (if (target-riscv64?) + (list config) + '())) (inputs (list libpng jasper)) (home-page "https://icns.sourceforge.io/")