From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id wEdQFi96KGaqYgEA62LTzQ:P1 (envelope-from ) for ; Wed, 24 Apr 2024 05:19:11 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id wEdQFi96KGaqYgEA62LTzQ (envelope-from ) for ; Wed, 24 Apr 2024 05:19:11 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1713928751; a=rsa-sha256; cv=none; b=UzxGGhLi/2eZWV366gsOR7ZkTYVTpqDGIfP7MjeOPEvX6AcMUtcPrv+e6B1+k7+aau1S8O g4Jdi7H10HzQUVcV2yEsq568YtwvSBixNsPnZHqHe+uuQ5nx00XMiy/YlkLC6AipG/Bheh Dfpy1jE+CcQiPSdvYaD+PXR9JCKqbxNxO33ooYR5rWk0s99hapO7WtZXYXla5V775jIRty DiWDZWiniq8NYPul8ykDeTEo8+5YTGlOBczYRn8sleNgFgSdmbTN1xAcPC1duf96stqFP4 eC4tiwve2JPzoZVxtrP+hqtw7C+kxxEf0WkwlI/OMH0PtKGt2Eyp7Nt8QgpxNQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1713928751; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=FyBZ0qOrA6jr2APewnds1nAkZbf7C4GDhwyK4GXtQbw=; b=qIUa+l5XbFuhyHd5w/tQwjRCFMeJxbX9OC2NFYV1r/MpT78d6iD+B+PbTmz8/u/OQuFKZ1 SAT+7WT0j50IUlPXELEE6zhO6Y9bip6EeGgkLZ93r3WelOxF7qzMMMHFngTCUNbqCxWWY9 ZcVp2uvYo2yikRf5mOJQm3bi6/pqAcVLgkC4CCkm3p/HppThqKMRmogy9fJSoPaM3hI7Mz hOAD4HuuWLsYgyovR75V8I1/6SqVwkRFGsMjvMBNijRZqSTTQzRxBCLcvIKL6hfPUKKqmt K/PZctaGzHeISHePepkQ/RdNWMonhvbC1yXPg8A8qfrq9IqOE+d+erUOpcVFeg== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 169086BA18 for ; Wed, 24 Apr 2024 05:19:11 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rzT9m-00006B-1n; Tue, 23 Apr 2024 23:18:50 -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 1rzT9j-00005z-OS for guix-patches@gnu.org; Tue, 23 Apr 2024 23:18:47 -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 1rzT9j-0007PQ-Ex for guix-patches@gnu.org; Tue, 23 Apr 2024 23:18:47 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rzT9z-0003EC-R4; Tue, 23 Apr 2024 23:19:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70546] [PATCH] gnu: cairo: Fix cross-compilation. 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 03:19:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 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-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Liliana Marie Prikler , Maxim Cournoyer , Vivien Kraus Received: via spool by submit@debbugs.gnu.org id=B.171392868811801 (code B ref -1); Wed, 24 Apr 2024 03:19:03 +0000 Received: (at submit) by debbugs.gnu.org; 24 Apr 2024 03:18:08 +0000 Received: from localhost ([127.0.0.1]:55952 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rzT92-00033X-MJ for submit@debbugs.gnu.org; Tue, 23 Apr 2024 23:18:07 -0400 Received: from lists.gnu.org ([2001:470:142::17]:53908) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rzT8w-00031U-V6 for submit@debbugs.gnu.org; Tue, 23 Apr 2024 23:18:02 -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 1rzT8a-00085B-A6 for guix-patches@gnu.org; Tue, 23 Apr 2024 23:17:36 -0400 Received: from smtp84.cstnet.cn ([159.226.251.84] 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 1rzT8X-0007Gh-6u for guix-patches@gnu.org; Tue, 23 Apr 2024 23:17:36 -0400 Received: from m.tailaa68d.ts.net (unknown [183.247.5.102]) by APP-05 (Coremail) with SMTP id zQCowAB3fgLAeShmxHi9BQ--.30032S2; Wed, 24 Apr 2024 11:17:22 +0800 (CST) From: Zheng Junjie Date: Wed, 24 Apr 2024 11:17:18 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Type: text/plain; charset=y Content-Transfer-Encoding: 8bit X-CM-TRANSID: zQCowAB3fgLAeShmxHi9BQ--.30032S2 X-Coremail-Antispam: 1UD129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7v73 VFW2AGmfu7bjvjm3AaLaJ3UjIYCTnIWjp_UUUYh7k0a2IF6F4UM7kC6x804xWl14x267AK xVWUJVW8JwAFc2x0x2IEx4CE42xK8VAvwI8IcIk0rVWrJVCq3wAFIxvE14AKwVWUJVWUGw A2ocxC64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26r1I 6r4UM28EF7xvwVC0I7IYx2IY6xkF7I0E14v26F4j6r4UJwA2z4x0Y4vEx4A2jsIE14v26r 4UJVWxJr1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvE ncxIr21le4C262xC7I0v67AEwI8IwI1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjx v20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1l F7xvr2IYc2Ij64vIr41lw4CEx2IqxVAFz4v204v26I0v724l42xK82IYc2Ij64vIr41l4I 8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AK xVWUJVWUGwC2zVAF1VAY17CE14v26r1j6r15MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcV AFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r1j6r4UMIIF0xvE42xK8VAvwI8I cIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r 4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxU2_HUDUUUU X-Originating-IP: [183.247.5.102] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ Received-SPF: pass client-ip=159.226.251.84; 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Spam-Score: -3.89 X-Migadu-Queue-Id: 169086BA18 X-Migadu-Spam-Score: -3.89 X-Migadu-Scanner: mx10.migadu.com X-TUID: YM9rjnRuTz7W * gnu/packages/gtk.scm (cairo)[arguments]: When cross-compilation, Add fix-cross-compile phase. Change-Id: I3579bb1249c749ee5f164bb4dd47f585b181c2bc --- gnu/packages/gtk.scm | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index b0098e780e..8fcd3ed1f3 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-compile + (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?) '() base-commit: d115af1bcc48f07a40dafd94d1d00926d446d068 -- 2.41.0