From patchwork Sun Nov 12 08:19:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Zheng Junjie X-Patchwork-Id: 56369 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 705EF27BBEA; Sun, 12 Nov 2023 08:21:52 +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 7800F27BBE2 for ; Sun, 12 Nov 2023 08:21:50 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1r25in-0007Z5-7M; Sun, 12 Nov 2023 03:21:33 -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 1r25ik-0007Yv-DC for guix-patches@gnu.org; Sun, 12 Nov 2023 03:21:30 -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 1r25id-0006Do-Hg for guix-patches@gnu.org; Sun, 12 Nov 2023 03:21:30 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1r25jG-0000TH-IM; Sun, 12 Nov 2023 03:22:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67108] [PATCH v2] gnu: librsvg-2.40: Fix cross-compiling. References: <3eb75ad72ebabc39a567c0f9883c526fd13e2e79.1699716624.git.zhengjunjie@iscas.ac.cn> In-Reply-To: <3eb75ad72ebabc39a567c0f9883c526fd13e2e79.1699716624.git.zhengjunjie@iscas.ac.cn> Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, rg@raghavgururajan.name, guix-patches@gnu.org Resent-Date: Sun, 12 Nov 2023 08:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67108 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 67108@debbugs.gnu.org Cc: Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan X-Debbugs-Original-Xcc: Liliana Marie Prikler , Maxim Cournoyer , Raghav Gururajan Received: via spool by 67108-submit@debbugs.gnu.org id=B67108.16997772751733 (code B ref 67108); Sun, 12 Nov 2023 08:22:02 +0000 Received: (at 67108) by debbugs.gnu.org; 12 Nov 2023 08:21:15 +0000 Received: from localhost ([127.0.0.1]:55063 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r25iU-0000Rt-Qy for submit@debbugs.gnu.org; Sun, 12 Nov 2023 03:21:15 -0500 Received: from smtp21.cstnet.cn ([159.226.251.21]:55750 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r25iS-0000Rd-21 for 67108@debbugs.gnu.org; Sun, 12 Nov 2023 03:21:14 -0500 Received: from localhost.localdomain (unknown [112.10.199.33]) by APP-01 (Coremail) with SMTP id qwCowAAXzDD7iVBlEhmeBA--.34958S2; Sun, 12 Nov 2023 16:17:00 +0800 (CST) From: Zheng Junjie Date: Sun, 12 Nov 2023 16:19:36 +0800 Message-ID: <9010adfa43b7bffa2514ffea582f28bf3448efc8.1699777176.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-CM-TRANSID: qwCowAAXzDD7iVBlEhmeBA--.34958S2 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: [112.10.199.33] 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: , 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/gnome.scm (librsvg-2.40): Fix cross-compiling. [arguments]<#:configure-flags>: When cross-compiling, disable gobject-introspection. [native-inputs]: When cross-compiling, add gdk-pixbuf. (librsvg-for-system): Use the C version when cross-compiling. Change-Id: Icb95763422269eed2e067a1d06166c3ed4bdeedc --- gnu/packages/gnome.scm | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) base-commit: af6105afc67a15a491a0a4fd18a28c9f801a0b94 diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ac3035e07d..b832ff1099 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -77,6 +77,7 @@ ;;; Copyright © 2023 Juliana Sims ;;; Copyright © 2023 Dominik Delgado Steuter ;;; Copyright © 2023 Zhu Zihao +;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; ;;; This file is part of GNU Guix. ;;; @@ -3663,7 +3664,10 @@ (define-public librsvg-2.40 "1fljkag2gr7c4k5mn798lgf9903xslz8h51bgvl89nnay42qjqpp")))) (build-system gnu-build-system) (arguments - `(#:configure-flags (list "--disable-static") + `(#:configure-flags (list "--disable-static" + ,@(if (%current-target-system) + '("--disable-introspection") + '())) #:phases (modify-phases %standard-phases (add-before 'configure 'pre-configure @@ -3702,9 +3706,12 @@ (define-public librsvg-2.40 "bugs/340047.svg" "bugs/749415.svg")))))))) (native-inputs - (list pkg-config - `(,glib "bin") ; glib-mkenums, etc. - gobject-introspection)) ; g-ir-compiler, etc. + `(,pkg-config + ,@(if (%current-target-system) + (list gdk-pixbuf) + '()) + (,glib "bin") ; glib-mkenums, etc. + ,gobject-introspection)) ; g-ir-compiler, etc. (inputs (list pango libcroco libxml2)) (propagated-inputs @@ -3719,9 +3726,12 @@ (define* (librsvg-for-system #:optional ;; Since librsvg 2.50 depends on Rust, and Rust is only correctly supported ;; on x86_64, aarch64 and riscv64 so far, use the ancient C version on other ;; platforms (FIXME). - (if (supported-package? librsvg) - librsvg - librsvg-2.40)) + ;; and for now cargo-build-system is no support cross-compiling, so when + ;; cross-compiling we just use C version. + (if (or (%current-target-system) + (not (supported-package? librsvg system))) + librsvg-2.40 + librsvg)) (export librsvg-for-system)