From patchwork Fri Dec 29 12:08:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Z572 X-Patchwork-Id: 58151 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 68EF827BBE9; Fri, 29 Dec 2023 12:11:29 +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 B9ABD27BBE2 for ; Fri, 29 Dec 2023 12:11:27 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rJBhj-00038m-EH; Fri, 29 Dec 2023 07:11:07 -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 1rJBhg-00038a-89 for guix-patches@gnu.org; Fri, 29 Dec 2023 07:11:04 -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 1rJBhe-0005nR-4i for guix-patches@gnu.org; Fri, 29 Dec 2023 07:11:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rJBhd-0004aR-TA for guix-patches@gnu.org; Fri, 29 Dec 2023 07:11:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68098] [PATCH] gnu: libid3tag: Fix cross-compiling. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 29 Dec 2023 12:11:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68098 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68098@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170385180617556 (code B ref -1); Fri, 29 Dec 2023 12:11:01 +0000 Received: (at submit) by debbugs.gnu.org; 29 Dec 2023 12:10:06 +0000 Received: from localhost ([127.0.0.1]:40856 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJBgg-0004Z3-Ia for submit@debbugs.gnu.org; Fri, 29 Dec 2023 07:10:06 -0500 Received: from lists.gnu.org ([2001:470:142::17]:34750) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rJBge-0004YM-FN for submit@debbugs.gnu.org; Fri, 29 Dec 2023 07:10:01 -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 1rJBgS-0002aL-LU for guix-patches@gnu.org; Fri, 29 Dec 2023 07:09:48 -0500 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 1rJBgO-0005Nf-2q for guix-patches@gnu.org; Fri, 29 Dec 2023 07:09:48 -0500 Received: from localhost.localdomain (unknown [183.247.5.190]) by APP-03 (Coremail) with SMTP id rQCowABXeZr7to5lPt+2AQ--.58092S2; Fri, 29 Dec 2023 20:09:33 +0800 (CST) From: Zheng Junjie Date: Fri, 29 Dec 2023 20:08:29 +0800 Message-ID: <54a60f22c461db227f40b11f34cbdcfe1363fb31.1703851666.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-CM-TRANSID: rQCowABXeZr7to5lPt+2AQ--.58092S2 X-Coremail-Antispam: 1UD129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UjIYCTnIWjp_UUUYT7k0a2IF6F4UM7kC6x804xWl14x267AK xVWUJVW8JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGw A2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26r1I 6r4UM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4j6F4UM28EF7xvwVC2z280aVAFwI0_Cr 1j6rxdM28EF7xvwVC2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv 0487M2AExVAIFx02aVAFz4v204v7Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2 IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0 Y48IcxkI7VAKI48JM4kE6I8I3I0E14AKx2xKxVC2ax8xMxAIw28IcxkI7VAKI48JMxC20s 026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_ Jr0_Jr4lx4CE17CEb7AF67AKxVWUJVWUXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14 v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4v20xva j40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVWUJV W8JbIYCTnIWIevJa73UjIFyTuYvjxU2_HUDUUUU X-Originating-IP: [183.247.5.190] 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, 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/mp3.scm (libid3tag) [native-inputs]: when cross compiling to {riscv,aarch}64-linux-gnu, add config. [arguments]: when target {riscv,aarch}64-linux-gnu, add update-config-scripts phase. Change-Id: I715e20b7d0aeabe7eba76185b542d9d184167448 --- gnu/packages/mp3.scm | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) base-commit: f90d6adec787187f7929159e3327c73245d3bbe3 diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index 7ede16f4bb..67b1528a7f 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -12,6 +12,7 @@ ;;; Copyright © 2021 Guillaume Le Vaillant ;;; Copyright © 2022 John Kehayias ;;; Copyright © 2022 Joeke de Graaf +;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -161,7 +162,28 @@ (define-public libid3tag Version: ~a~@ Libs: -L${libdir} -lid3tag -lz~@ Cflags: -I${includedir}~%" - out ,version))))))))) + out ,version)))))) + ,@(if (and (%current-target-system) + (or (target-riscv64?) + (target-aarch64?))) + `((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)) ".")) + '("config.guess" "config.sub"))))) + '())))) + (native-inputs (if (and (%current-target-system) + (or (target-riscv64?) + (target-aarch64?))) + (list config) + '())) (inputs (list zlib)) (synopsis "Library for reading ID3 tags") (description