From patchwork Wed Aug 25 18:03:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 32293 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 C7F7527BBE4; Wed, 25 Aug 2021 19:10:22 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5AB8427BBE1 for ; Wed, 25 Aug 2021 19:10:22 +0100 (BST) Received: from localhost ([::1]:37388 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIxLx-0006TK-F5 for patchwork@mira.cbaines.net; Wed, 25 Aug 2021 14:10:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:60472) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIxLf-00062Q-Br for guix-patches@gnu.org; Wed, 25 Aug 2021 14:10:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36267) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mIxLf-0005D1-4S for guix-patches@gnu.org; Wed, 25 Aug 2021 14:10:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mIxLe-00034W-VS for guix-patches@gnu.org; Wed, 25 Aug 2021 14:10:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50201] [PATCH 37/52] gnu: at-spi2-core: Don't cross-compile documentation. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 25 Aug 2021 18:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 50201 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 50201@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 50201-submit@debbugs.gnu.org id=B50201.162991497711740 (code B ref 50201); Wed, 25 Aug 2021 18:10:02 +0000 Received: (at 50201) by debbugs.gnu.org; 25 Aug 2021 18:09:37 +0000 Received: from localhost ([127.0.0.1]:47807 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxLF-00033C-3r for submit@debbugs.gnu.org; Wed, 25 Aug 2021 14:09:37 -0400 Received: from leibniz.telenet-ops.be ([195.130.137.77]:52094) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxLC-00032T-9R for 50201@debbugs.gnu.org; Wed, 25 Aug 2021 14:09:36 -0400 Received: from laurent.telenet-ops.be (laurent.telenet-ops.be [IPv6:2a02:1800:110:4::f00:19]) by leibniz.telenet-ops.be (Postfix) with ESMTPS id 4Gvv433rb6zMqhm5 for <50201@debbugs.gnu.org>; Wed, 25 Aug 2021 20:03:47 +0200 (CEST) Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id lu3k2500G0mfAB401u3n9R; Wed, 25 Aug 2021 20:03:47 +0200 From: Maxime Devos Date: Wed, 25 Aug 2021 20:03:17 +0200 Message-Id: <20210825180332.5720-37-maximedevos@telenet.be> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210825180332.5720-1-maximedevos@telenet.be> References: <20210825180332.5720-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1629914627; bh=uinquif/dC+EkmCEcL+ynVcq2Qt2ZKWVBLGkyg0aHHU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=DJTnmJign0Zzwmw256B3K4UoHKnUkKcgpXsk6m59oj1VBGVUULrmKlCFQfjvNmJ8p KAquFZWSvTBKEiisP60sH+74/h3vm7yqgdGWytLE9nf3HGIoLJOcbOssqHJvYWXq+2 6e1LCkC6sFRXEEfTVR6gS4Bz5JDcDrw7p59n14qo416Y+eMZOwCe0vctpX11HPsyT9 H9SEaHSxqxVZGPCkmm8ej5aWGdoXkRN9d4wIxwCq4ICftgaCnmU+ZLrPofEUBeJACd gdZqlhijWHOwY8YwvWQ+zqkZlsn4FWhpNNBeE3xEJW/eNRkncucOoebwdry//ukKGw /UsO2xbwISplw== 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gtk.scm (at-spi2-core)[arguments]<#:configure-flags>: Set docs=false when cross-compiling. (at-spi2-core)[arguments]<#:phases>{move-documentation}: Remove when cross-compiling. --- gnu/packages/gtk.scm | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 48abbdcd77..73b805f6fe 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -724,9 +724,13 @@ scaled, composited, modified, saved, or rendered.") (build-system meson-build-system) (outputs '("out" "doc")) (arguments - '(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas + `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas #:configure-flags - (list "-Ddocs=true") + ;; Generating documentation requires running binaries for the host + ;; on the build machine. + (list ,(if (%current-target-system) + "-Ddocs=false" + "-Ddocs=true")) #:phases (modify-phases %standard-phases (add-after 'unpack 'set-documentation-path @@ -748,16 +752,18 @@ scaled, composited, modified, saved, or rendered.") (("http://.*/docbookx\\.dtd") (string-append xmldoc "/docbookx.dtd"))) #t))) - (add-after 'install 'move-documentation - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc"))) - (copy-recursively - (string-append out "/share/gtk-doc") - (string-append doc "/share/gtk-doc")) - (delete-file-recursively - (string-append out "/share/gtk-doc"))) - #t)) + ,@(if (%current-target-system) + '() + '((add-after 'install 'move-documentation + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) + (copy-recursively + (string-append out "/share/gtk-doc") + (string-append doc "/share/gtk-doc")) + (delete-file-recursively + (string-append out "/share/gtk-doc"))) + #t)))) (add-after 'install 'check (lambda _ (setenv "HOME" (getenv "TMPDIR")) ; xfconfd requires a writable HOME