From patchwork Thu Dec 28 13:57:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Junjie X-Patchwork-Id: 58137 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 3866227BBE2; Thu, 28 Dec 2023 14:00:43 +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 A13FC27BBE9 for ; Thu, 28 Dec 2023 14:00:41 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rIqvh-0006cV-EQ; Thu, 28 Dec 2023 09:00:09 -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 1rIqvc-0006bq-GH for guix-patches@gnu.org; Thu, 28 Dec 2023 09:00:05 -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 1rIqvb-0006v5-Le for guix-patches@gnu.org; Thu, 28 Dec 2023 09:00:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rIqva-0006gO-Pq for guix-patches@gnu.org; Thu, 28 Dec 2023 09:00:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68082] [PATCH] gnu: libmng: Fix cross-compiling to riscv64-linux. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Dec 2023 14:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68082 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68082@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170377196425610 (code B ref -1); Thu, 28 Dec 2023 14:00:02 +0000 Received: (at submit) by debbugs.gnu.org; 28 Dec 2023 13:59:24 +0000 Received: from localhost ([127.0.0.1]:38745 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rIqux-0006f0-KP for submit@debbugs.gnu.org; Thu, 28 Dec 2023 08:59:23 -0500 Received: from lists.gnu.org ([2001:470:142::17]:40650) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rIquw-0006ej-4u for submit@debbugs.gnu.org; Thu, 28 Dec 2023 08:59:22 -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 1rIqur-0006Xo-1b for guix-patches@gnu.org; Thu, 28 Dec 2023 08:59:17 -0500 Received: from smtp21.cstnet.cn ([159.226.251.21] 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 1rIquo-0006Op-EC for guix-patches@gnu.org; Thu, 28 Dec 2023 08:59:16 -0500 Received: from localhost.localdomain (unknown [183.247.5.190]) by APP-01 (Coremail) with SMTP id qwCowAC3F0Ebfo1lAWfAAQ--.19898S2; Thu, 28 Dec 2023 21:54:37 +0800 (CST) From: Zheng Junjie Date: Thu, 28 Dec 2023 21:57:58 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-CM-TRANSID: qwCowAC3F0Ebfo1lAWfAAQ--.19898S2 X-Coremail-Antispam: 1UD129KBjvJXoW7WFyxZw4DJF45CrWrtw4UCFg_yoW8Xr4Upa 90yF1jgw18tFyfJFZxtFyI9F1ag397Cr15Aws7A345Aw4Y9FWF9r9xKr4fGF47XanrGa4U Xa1ktFW5GFy8Ga7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUy2b7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Jr0_JF4l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Jr0_Gr1l84ACjcxK6I8E87Iv67AKxVWxJr0_GcWl84ACjcxK6I 8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI 64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8Jw Am72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64vIr41l4I8I 3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxV WUGVWUWwC2zVAF1VAY17CE14v26r1j6r15MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAF wI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r1j6r4UMIIF0xvE42xK8VAvwI8IcI k0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r1j 6r4UYxBIdaVFxhVjvjDU0xZFpf9x07bOoGdUUUUU= X-Originating-IP: [183.247.5.190] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ Received-SPF: pass client-ip=159.226.251.21; envelope-from=zhengjunjie@iscas.ac.cn; helo=cstnet.cn X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, 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/image.scm (libmng) [native-inputs]: When cross compiling to riscv64-linux-gnu, add config. [arguments]: When target riscv64-linux-gnu, add update-config-scripts phase. Change-Id: I906a2b7b7691ae53592cfa35ba64fc7e7d735664 --- gnu/packages/image.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) base-commit: bc509aba838780502b83f7fc3d2aee72903656f2 diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index ebabd1c973..79f1a293ec 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -1483,6 +1483,26 @@ (define-public libmng (base32 "1lvxnpds0vcf0lil6ia2036ghqlbl740c4d2sz0q5g6l93fjyija")))) (build-system gnu-build-system) + (arguments + (if (and (target-riscv64?) + (%current-target-system)) + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'update-config-scripts + (lambda* (#:key inputs native-inputs #:allow-other-keys) + ;; Replace outdated config.guess and config.sub. + (for-each (lambda (file) + (install-file + (search-input-file + (or native-inputs inputs) + (string-append "/bin/" file)) ".")) + '("config.guess" "config.sub")))))) + '())) + (native-inputs + (if (and (target-riscv64?) + (%current-target-system)) + (list config) + '())) (propagated-inputs ;; These are all in the 'Libs.private' field of libmng.pc. (list lcms libjpeg-turbo zlib))