From patchwork Wed Aug 25 18:03:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 32282 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 B2BBA27BBE3; Wed, 25 Aug 2021 19:06:31 +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 487FF27BBE1 for ; Wed, 25 Aug 2021 19:06:31 +0100 (BST) Received: from localhost ([::1]:34452 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mIxIE-0004Mm-BW for patchwork@mira.cbaines.net; Wed, 25 Aug 2021 14:06:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59446) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mIxHn-0003bH-KD for guix-patches@gnu.org; Wed, 25 Aug 2021 14:06:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:36235) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mIxHn-0002Rw-CP for guix-patches@gnu.org; Wed, 25 Aug 2021 14:06:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mIxHn-0002wE-7o for guix-patches@gnu.org; Wed, 25 Aug 2021 14:06:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#50201] [PATCH 31/52] gnu: json-glib: Don't build gtk documentation when cross-compiling. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 25 Aug 2021 18:06:03 +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.162991472211094 (code B ref 50201); Wed, 25 Aug 2021 18:06:03 +0000 Received: (at 50201) by debbugs.gnu.org; 25 Aug 2021 18:05:22 +0000 Received: from localhost ([127.0.0.1]:47759 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxH4-0002sj-FO for submit@debbugs.gnu.org; Wed, 25 Aug 2021 14:05:22 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:55702) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mIxFb-0002i5-89 for 50201@debbugs.gnu.org; Wed, 25 Aug 2021 14:03:49 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by laurent.telenet-ops.be with bizsmtp id lu3k2500G0mfAB401u3m9B; Wed, 25 Aug 2021 20:03:46 +0200 From: Maxime Devos Date: Wed, 25 Aug 2021 20:03:11 +0200 Message-Id: <20210825180332.5720-31-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=1629914626; bh=SanOm3VbysYMGhrp3tuoZ/1TreneFf+KCpMfb3eRQuM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Nm9XO62VkZSmKyUhiXEPb37BRPLww+T4xkeIwVTWXo52f1dBf5GnoPSfN3abMNucc 1Rghaqej2SfU9Jpk1xRm+euRLVRTRd9/tM+4lbDNbUIayKEFFP6Z9K3edn6PRH/m5R 14fykMT3o2VeC/Tqw+mWW8kaO1NVQE6vOjC6lTe9z9+ojIgR/550qk3kVV45aP7XaZ 1wX319ZVGqNfe9IMMSz0d51/UQivSnhUSPDiPOnzyAXgetr2hvcyBhz401BLIQqGH4 RfZOCDX45XADvelD1Ru3m7ezRfg1IEgNR3Ipek0Hm0WPLDC90yBodRrxMYBfsqziVs wqLebR1eO+oQg== 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/gnome.scm (json-glib)[arguments]<#:configue-flags>: Set gtk_doc=disables when cross-compiling. (json-glib)[arguments]<#:phases>{move-docs}: Don't run when cross-compiling ... (json-glib)[arguments]<#:phases>{stub-docs}: ... instead, create an empty directory where the documentation would be. --- gnu/packages/gnome.scm | 31 +++++++++++++++++++++---------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c0b6d010c7..febbe10ee8 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4577,7 +4577,12 @@ configuration storage systems.") #:configure-flags (list "-Ddocs=true" - "-Dman=true") + "-Dman=true" + ,@(if (%current-target-system) + ;; If enabled, gtkdoc-scangobj will try to execute a + ;; cross-compiled binary. + '("-Dgtk_doc=disabled") + '())) #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-docbook @@ -4601,15 +4606,21 @@ configuration storage systems.") 'inputs) "docbook-xsl") "/xml/xsl/docbook-xsl-1.79.2/")))) #t)) - (add-after 'install 'move-docs - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc"))) - (mkdir-p (string-append doc "/share")) - (rename-file - (string-append out "/share/gtk-doc") - (string-append doc "/share/gtk-doc")) - #t)))))) + ;; When cross-compiling, there are no docs to move. + ,(if (%current-target-system) + '(add-after 'install 'stub-docs + (lambda* (#:key outputs #:allow-other-keys) + ;; The daemon doesn't like empty output paths. + (mkdir (assoc-ref outputs "doc")))) + '(add-after 'install 'move-docs + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc"))) + (mkdir-p (string-append doc "/share")) + (rename-file + (string-append out "/share/gtk-doc") + (string-append doc "/share/gtk-doc")) + #t))))))) (native-inputs `(("docbook-xml" ,docbook-xml-4.3) ("docbook-xsl" ,docbook-xsl)