From patchwork Fri Mar 22 16:44:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Junjie X-Patchwork-Id: 62130 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 D384227BBE9; Fri, 22 Mar 2024 17:16:04 +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 280D427BBE2 for ; Fri, 22 Mar 2024 17:16:03 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rniUI-0007oq-KL; Fri, 22 Mar 2024 13:15:26 -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 1rniUG-0007oH-3U for guix-patches@gnu.org; Fri, 22 Mar 2024 13:15:24 -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 1rniUF-0003so-Ng for guix-patches@gnu.org; Fri, 22 Mar 2024 13:15:23 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rniUu-0001tM-BU for guix-patches@gnu.org; Fri, 22 Mar 2024 13:16:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69946] [PATCH] gnu: libatasmart: Fix cross-compiling to riscv64-linux. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 22 Mar 2024 17:16:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 69946 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69946@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.17111277437177 (code B ref -1); Fri, 22 Mar 2024 17:16:04 +0000 Received: (at submit) by debbugs.gnu.org; 22 Mar 2024 17:15:43 +0000 Received: from localhost ([127.0.0.1]:36586 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rniUY-0001ra-QB for submit@debbugs.gnu.org; Fri, 22 Mar 2024 13:15:43 -0400 Received: from lists.gnu.org ([209.51.188.17]:59478) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rniUT-0001qk-JM for submit@debbugs.gnu.org; Fri, 22 Mar 2024 13:15:38 -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 1rni0Y-0000yY-39 for guix-patches@gnu.org; Fri, 22 Mar 2024 12:44:42 -0400 Received: from smtp81.cstnet.cn ([159.226.251.81] 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 1rni0V-0006F2-1N for guix-patches@gnu.org; Fri, 22 Mar 2024 12:44:41 -0400 Received: from m.taildaf0f.ts.net (unknown [183.247.5.22]) by APP-03 (Coremail) with SMTP id rQCowACXlhJktf1lB3rRBw--.9274S2; Sat, 23 Mar 2024 00:44:21 +0800 (CST) From: Zheng Junjie Date: Sat, 23 Mar 2024 00:44:20 +0800 Message-ID: <2a5a54bdec875b00607eb33eb69f10493ec228f0.1711125850.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-CM-TRANSID: rQCowACXlhJktf1lB3rRBw--.9274S2 X-Coremail-Antispam: 1UD129KBjvJXoW7Aw4DGF1xur48XFy8Zr47Jwb_yoW8XrWkpF 4rZFn7KF18GrWfJrZFga1I9F1YgFZ5uF1Y9ws2yw1rtw4YvFy0vr9xK39xtF17X3Z7G3WU CF4rtr45Gry5C3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUy2b7Iv0xC_tr1lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Jr0_JF4l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Jr0_Gr1l84ACjcxK6I8E87Iv67AKxVW8JVWxJwA2z4x0Y4vEx4 A2jsIEc7CjxVAFwI0_Gr0_Gr1UM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI 64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8Jw Am72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64vIr41l4I8I 3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxV WUGVWUWwC2zVAF1VAY17CE14v26r1j6r15MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAF wI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r1j6r4UMIIF0xvE42xK8VAvwI8IcI k0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r1j 6r4UYxBIdaVFxhVjvjDU0xZFpf9x07jY6wZUUUUU= X-Originating-IP: [183.247.5.22] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ Received-SPF: pass client-ip=159.226.251.81; 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 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/freedesktop.scm (libatasmart) [native-inputs]: When cross compiling to riscv64-linux-gnu, add config. [arguments]: When target riscv64-linux-gnu, add update-config phase. Change-Id: I491c43a6ce2c3fc3aed43ecab9d4a2ab251038bb --- gnu/packages/freedesktop.scm | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) base-commit: 40f53e8fb5b867e3a1e8fa798328423718282aac diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 8a4f490be2..5518d38af5 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1525,7 +1525,25 @@ (define-public libatasmart "138gvgdwk6h4ljrjsr09pxk1nrki4b155hqdzyr8mlk3bwsfmw31")))) (build-system gnu-build-system) (native-inputs - (list pkg-config)) + (append (if (and (%current-target-system) + (target-riscv64?)) + (list config) + '()) + (list pkg-config))) + (arguments + (if (and (%current-target-system) + (target-riscv64?)) + (list #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'update-config + (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)) "build-aux")) + '("config.guess" "config.sub")))))) + '())) (inputs (list eudev)) (home-page "https://0pointer.de/blog/projects/being-smart.html")