From patchwork Wed Apr 24 04:34:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Zheng Junjie X-Patchwork-Id: 63327 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 547F327BBEA; Wed, 24 Apr 2024 05:36:14 +0100 (BST) 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=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 C19B627BBE2 for ; Wed, 24 Apr 2024 05:36:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rzUMM-0004GF-4n; Wed, 24 Apr 2024 00:35:54 -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 1rzUMH-0004Fy-4V for guix-patches@gnu.org; Wed, 24 Apr 2024 00:35:49 -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 1rzUMG-00031Z-6O for guix-patches@gnu.org; Wed, 24 Apr 2024 00:35:48 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rzUMW-0006mx-7a; Wed, 24 Apr 2024 00:36:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70546] [PATCH v2] gnu: cairo: Fix cross-compilation. References: In-Reply-To: Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: liliana.prikler@gmail.com, maxim.cournoyer@gmail.com, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Wed, 24 Apr 2024 04:36:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70546 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70546@debbugs.gnu.org Cc: Liliana Marie Prikler , Maxim Cournoyer , Vivien Kraus X-Debbugs-Original-Xcc: Liliana Marie Prikler , Maxim Cournoyer , Vivien Kraus Received: via spool by 70546-submit@debbugs.gnu.org id=B70546.171393330925467 (code B ref 70546); Wed, 24 Apr 2024 04:36:03 +0000 Received: (at 70546) by debbugs.gnu.org; 24 Apr 2024 04:35:09 +0000 Received: from localhost ([127.0.0.1]:56254 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rzULX-0006bV-FG for submit@debbugs.gnu.org; Wed, 24 Apr 2024 00:35:08 -0400 Received: from smtp21.cstnet.cn ([159.226.251.21]:52266 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rzULR-0006Yb-N7 for 70546@debbugs.gnu.org; Wed, 24 Apr 2024 00:35:02 -0400 Received: from m.tailaa68d.ts.net (unknown [183.247.5.102]) by APP-01 (Coremail) with SMTP id qwCowAAnbs7TiyhmE_ywBQ--.11395S2; Wed, 24 Apr 2024 12:34:27 +0800 (CST) From: Zheng Junjie Date: Wed, 24 Apr 2024 12:34:25 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-CM-TRANSID: qwCowAAnbs7TiyhmE_ywBQ--.11395S2 X-Coremail-Antispam: 1UD129KBjvJXoW7WF43WFWxZF4UXrW8Gry7Awb_yoW8Cr18pF Z7Gr4q93WfXrWkKanxt3W09an0qas3Ga4UXwn7Aa15tr4F9ry2krWjqrWfWF12yrn7u3yf W3WSgFn5GF45JaDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUyab7Iv0xC_KF4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_JFI_Gr1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Gr0_Cr1l84ACjcxK6I8E87Iv67AKxVW8Jr0_Cr1UM28EF7xvwV C2z280aVCY1x0267AKxVW0oVCq3wAS0I0E0xvYzxvE52x082IY62kv0487Mc02F40EFcxC 0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWUGwAv7VC2z280aVAFwI0_Jr0_Gr 1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI48JMxAIw28IcxkI7VAKI48JMxC2 0s026xCaFVCjc4AY6r1j6r4UMI8I3I0E5I8CrVAFwI0_Jr0_Jr4lx2IqxVCjr7xvwVAFwI 0_JrI_JrWlx4CE17CEb7AF67AKxVWUJVWUXwCIc40Y0x0EwIxGrwCI42IY6xIIjxv20xvE 14v26r1j6r1xMIIF0xvE2Ix0cI8IcVCY1x0267AKxVWUJVW8JwCI42IY6xAIw20EY4v20x vaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x0267AKxVW8 JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7IU8P5r7UUUUU== X-Originating-IP: [183.247.5.102] 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/gtk.scm (cairo)[arguments]: Add ‘fix-cross-compilation’ phase when cross-compiling. Change-Id: I3579bb1249c749ee5f164bb4dd47f585b181c2bc --- gnu/packages/gtk.scm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) base-commit: d115af1bcc48f07a40dafd94d1d00926d446d068 diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index b0098e780e..678bc89378 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -34,7 +34,7 @@ ;;; Copyright © 2022 Denis 'GNUtoo' Carikli ;;; Copyright © 2022 Petr Hodina ;;; Copyright © 2023 Sergiu Ivanov -;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023 Janneke Nieuwenhuizen ;;; Copyright © 2024 John Kehayias ;;; @@ -182,7 +182,19 @@ (define cairo `(#:tests? #f ; see http://lists.gnu.org/archive/html/bug-guix/2013-06/msg00085.html #:glib-or-gtk? #t #:configure-flags - (list "-Dtests=disabled"))) + (list "-Dtests=disabled") + ,@(if (%current-target-system) + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-cross-compilation + (lambda _ + ;; XXX: Let meson-build-system can customize the property + (substitute* "meson.build" + (("'ipc_rmid_deferred_release', 'auto'") + ;; see https://github.com/NixOS/nixpkgs/blob/df51f2293e935e85f6a2e69bcf89a40cb31bbc3d/pkgs/development/libraries/cairo/default.nix#L65 + ;; XXX: check it on hurd. + "'ipc_rmid_deferred_release', 'true'")))))) + '()))) (native-inputs `(,@(if (target-hurd?) '()