From patchwork Mon Mar 4 17:19:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Zheng Junjie X-Patchwork-Id: 61332 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 1436A27BBEA; Mon, 4 Mar 2024 17:21:08 +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=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 9906727BBE2 for ; Mon, 4 Mar 2024 17:21:07 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rhBzb-0003h4-O4; Mon, 04 Mar 2024 12:20:48 -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 1rhBzN-0003dJ-B5 for guix-patches@gnu.org; Mon, 04 Mar 2024 12:20:33 -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 1rhBzN-0006Za-3J for guix-patches@gnu.org; Mon, 04 Mar 2024 12:20:33 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rhBzq-0004F4-PP for guix-patches@gnu.org; Mon, 04 Mar 2024 12:21:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69549] [PATCH 1/2] gnu: libtheora: Use Gexps. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 04 Mar 2024 17:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69549 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69549@debbugs.gnu.org Received: via spool by 69549-submit@debbugs.gnu.org id=B69549.170957285416270 (code B ref 69549); Mon, 04 Mar 2024 17:21:02 +0000 Received: (at 69549) by debbugs.gnu.org; 4 Mar 2024 17:20:54 +0000 Received: from localhost ([127.0.0.1]:44760 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rhBzf-0004EB-6U for submit@debbugs.gnu.org; Mon, 04 Mar 2024 12:20:54 -0500 Received: from smtp84.cstnet.cn ([159.226.251.84]:38142 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rhBzQ-0004Cx-JG for 69549@debbugs.gnu.org; Mon, 04 Mar 2024 12:20:45 -0500 Received: from m.taildaf0f.ts.net (unknown [107.174.64.25]) by APP-05 (Coremail) with SMTP id zQCowAA3WKmsAuZljX5IBA--.59829S2; Tue, 05 Mar 2024 01:19:46 +0800 (CST) Date: Tue, 5 Mar 2024 01:19:34 +0800 Message-ID: <54eed70c09251e598db22f5f6d4bd98aaf4c8ff2.1709554982.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-CM-TRANSID: zQCowAA3WKmsAuZljX5IBA--.59829S2 X-Coremail-Antispam: 1UD129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UjIYCTnIWjp_UUUYT7k0a2IF6F4UM7kC6x804xWl14x267AK xVWUJVW8JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGw A2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26r1j 6r1xM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26r1j6r4UM28EF7xvwVC2z280aVAFwI0_Gr 0_Cr1l84ACjcxK6I8E87Iv6xkF7I0E14v26r4j6r4UJwAS0I0E0xvYzxvE52x082IY62kv 0487M2AExVAIFx02aVAFz4v204v7Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2 IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0 Y48IcxkI7VAKI48JM4kE6I8I3I0E14AKx2xKxVC2ax8xMxAIw28IcxkI7VAKI48JMxC20s 026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI0_ Jr0_Jr4lx4CE17CEb7AF67AKxVWUJVWUXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE14 v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4v20xva j40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVWUJV W8JbIYCTnIWIevJa73UjIFyTuYvjxU2_HUDUUUU X-Originating-IP: [107.174.64.25] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ 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: , X-Patchwork-Original-From: Zheng Junjie via Guix-patches From: Zheng Junjie Reply-To: Zheng Junjie 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/xiph.scm (libtheora): Use Gexps. Change-Id: Ie055cd4f6cb9d2a4601b93d1f9db227598349c7c --- gnu/packages/xiph.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm index b47c718fb6..879d8e8d39 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2021 Brendan Tildesley ;;; Copyright © 2021 Matthew James Kraai ;;; Copyright © 2021 Vinicius Monego +;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -47,7 +48,8 @@ (define-module (gnu packages xiph) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) - #:use-module (guix build-system gnu)) + #:use-module (guix build-system gnu) + #:use-module (guix gexp)) (define-public libogg (package @@ -115,7 +117,7 @@ (define-public libtheora (patches (search-patches "libtheora-config-guess.patch")))) (build-system gnu-build-system) (arguments - '(#:configure-flags '("--disable-static"))) + (list #:configure-flags #~'("--disable-static"))) (inputs (list libvorbis)) ;; The .pc files refer to libogg. (propagated-inputs (list libogg)) From patchwork Mon Mar 4 17:19:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Junjie X-Patchwork-Id: 61331 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 93A0927BBE2; Mon, 4 Mar 2024 17:20:56 +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 1C9B427BBE9 for ; Mon, 4 Mar 2024 17:20:53 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rhBzZ-0003fk-Qw; Mon, 04 Mar 2024 12:20:46 -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 1rhBzM-0003cv-Th for guix-patches@gnu.org; Mon, 04 Mar 2024 12:20:32 -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 1rhBzM-0006ZA-Ky for guix-patches@gnu.org; Mon, 04 Mar 2024 12:20:32 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rhBzq-0004Ex-9L for guix-patches@gnu.org; Mon, 04 Mar 2024 12:21:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69549] [PATCH 2/2] gnu: libtheora: Fix cross-compiling to riscv64-linux. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 04 Mar 2024 17:21:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69549 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69549@debbugs.gnu.org Received: via spool by 69549-submit@debbugs.gnu.org id=B69549.170957285116258 (code B ref 69549); Mon, 04 Mar 2024 17:21:02 +0000 Received: (at 69549) by debbugs.gnu.org; 4 Mar 2024 17:20:51 +0000 Received: from localhost ([127.0.0.1]:44758 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rhBza-0004Dz-NT for submit@debbugs.gnu.org; Mon, 04 Mar 2024 12:20:51 -0500 Received: from smtp84.cstnet.cn ([159.226.251.84]:38144 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rhBzQ-0004Cw-Iw for 69549@debbugs.gnu.org; Mon, 04 Mar 2024 12:20:45 -0500 Received: from m.taildaf0f.ts.net (unknown [107.174.64.25]) by APP-05 (Coremail) with SMTP id zQCowAA3WKmsAuZljX5IBA--.59829S3; Tue, 05 Mar 2024 01:19:49 +0800 (CST) Date: Tue, 5 Mar 2024 01:19:35 +0800 Message-ID: <56cec25717d3d0990351efad4acbe05eebe0d895.1709554982.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-CM-TRANSID: zQCowAA3WKmsAuZljX5IBA--.59829S3 X-Coremail-Antispam: 1UD129KBjvJXoW7Cr4ftF1DKw1fKry7Jw4Utwb_yoW8AF1kpF 4rAF9Yqw4UXryfJanaqF10gF13GrZ3CrW3Zws7C343Jw45trW0yrnrK34fAr17A3W7Aa17 JFWkKr43CFyxZFJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9jb7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI 8067AKxVWUGwA2048vs2IY020Ec7CjxVAFwI0_Jr4l8cAvFVAK0II2c7xJM28CjxkF64kE wVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWUJVWUCwA2z4x0Y4vE2Ix0cI8IcVCY1x 0267AKxVWUJVW8JwA2z4x0Y4vEx4A2jsIE14v26r4j6F4UM28EF7xvwVC2z280aVCY1x02 67AKxVW8JVW8Jr1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrV C2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE 7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7x kEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E 67AF67kF1VAFwI0_Jr0_JrylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCw CI42IY6xIIjxv20xvEc7CjxVAFwI0_Jr0_Gr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1x MIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Jr0_GrUvcSsGvf C2KfnxnUUI43ZEXa7IU5QqXJUUUUU== X-Originating-IP: [107.174.64.25] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ 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: , X-Patchwork-Original-From: Zheng Junjie via Guix-patches From: Zheng Junjie Reply-To: Zheng Junjie 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/xiph.scm (libtheora): [native-inputs]: When cross compiling to riscv64-linux-gnu, add config. [arguments]: When target riscv64-linux-gnu, add update-config phase. Change-Id: Ie055cd4f6cb9d2a4601b93d1f9db227598349c7c --- gnu/packages/xiph.scm | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/gnu/packages/xiph.scm b/gnu/packages/xiph.scm index 879d8e8d39..f3603c39bb 100644 --- a/gnu/packages/xiph.scm +++ b/gnu/packages/xiph.scm @@ -46,6 +46,7 @@ (define-module (gnu packages xiph) #:use-module (gnu packages xml) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix packages) + #:use-module (guix utils) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix build-system gnu) @@ -117,7 +118,26 @@ (define-public libtheora (patches (search-patches "libtheora-config-guess.patch")))) (build-system gnu-build-system) (arguments - (list #:configure-flags #~'("--disable-static"))) + (append + (if (and (target-riscv64?) + (%current-target-system)) + (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)) ".")) + '("config.guess" "config.sub")))))) + '()) + (list #:configure-flags #~'("--disable-static")))) + (native-inputs + (if (and (target-riscv64?) + (%current-target-system)) + (list config) + '())) (inputs (list libvorbis)) ;; The .pc files refer to libogg. (propagated-inputs (list libogg))