From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id AA0FJSvmf2OASgEAbAwnHQ (envelope-from ) for ; Thu, 24 Nov 2022 22:46:19 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id SBEsJSvmf2P8ggEA9RJhRA (envelope-from ) for ; Thu, 24 Nov 2022 22:46:19 +0100 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 5187621B43 for ; Thu, 24 Nov 2022 22:46:19 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oyJv1-0008Kl-RW; Thu, 24 Nov 2022 16:38:03 -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 1oyJv0-0008KV-BU for guix-patches@gnu.org; Thu, 24 Nov 2022 16:38:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oyJv0-0005mM-2X for guix-patches@gnu.org; Thu, 24 Nov 2022 16:38:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oyJuz-0008U6-Oa for guix-patches@gnu.org; Thu, 24 Nov 2022 16:38:01 -0500 Subject: bug#59313: [PATCH] gnu: linux-libre: Enable building html and info doc. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-To: guix-patches@gnu.org Resent-Date: Thu, 24 Nov 2022 21:38:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 59313 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 59313-done@debbugs.gnu.org, mail@cbaines.net Mail-Followup-To: 59313@debbugs.gnu.org, maxim.cournoyer@gmail.com, maxim.cournoyer@gmail.com Received: via spool by 59313-done@debbugs.gnu.org id=D59313.166932586032582 (code D ref 59313); Thu, 24 Nov 2022 21:38:01 +0000 Received: (at 59313-done) by debbugs.gnu.org; 24 Nov 2022 21:37:40 +0000 Received: from localhost ([127.0.0.1]:60434 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyJue-0008TS-EI for submit@debbugs.gnu.org; Thu, 24 Nov 2022 16:37:40 -0500 Received: from mail-qt1-f180.google.com ([209.85.160.180]:42848) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oyJub-0008TE-RN for 59313-done@debbugs.gnu.org; Thu, 24 Nov 2022 16:37:38 -0500 Received: by mail-qt1-f180.google.com with SMTP id h24so1600941qta.9 for <59313-done@debbugs.gnu.org>; Thu, 24 Nov 2022 13:37:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=aoGtrgHNQbKS9bcyGJavu/fMsZj81JeJmiaRWM8HNt8=; b=R52rnHNLpTuAxw24cbVWRpofTg9XTGNRU6Ll4/lHg2b7jT0q644LnZahbAD/A6jYUP qnxTzGhOcjZjIaqgMwabQYKc4hx7GcwVq2mV8pkPUz+Rr4vpJYyzzylpVADslafvsOrE ig9W+N4np4uTLjsJrJwf0NYqd0KlhPiF9/YTOUKQLqU+oBzGqakJJAJuL0v0ijGnYbOU 5YYJQ9dAs/JtC6ws/WrZ5/zZyTPL92sLtIWuL58s09vJl5w4B6ScKlj4tHjVJASBK/UH Z8rJ+ow22QVedu22LwKTGhJMTSNBQI3Z7cU93D/gpTgCCHSPMOa44s4fpo/bI3fyG41I 6wRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:user-agent:message-id :in-reply-to:date:references:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=aoGtrgHNQbKS9bcyGJavu/fMsZj81JeJmiaRWM8HNt8=; b=Jh1oap9yqzz8JsVGQrzE8aKfuMRZOsNiNWeBob7HTg1ZJ1ZaGFr4y/eRbZkyNVpQDH pSNHs2seY5loFL3ZRL5Y+cVlm5fYsbthiTwjeLqzsUm4uRb1QBcIsoAWagH1QgvyDRgu soALjjNvCsBkF9zsMtv5ErZjG8AMNMAmHVWJiHqOMmv3ZmH+DHJnB7Cbe8JcE5xiZgcN 7gYgdBNhI4Dx9JHdst0aWUsa8m5TAQF7KdlHHn+Pqo1H4gbjEn2o9o+agb+B1gOKKOfR 22HnTZUwHdIaBSIMI8bWFWG2x2W8l3O8ILKcnaA+pe6MFEK8Hpn1ihJN3e5JRiv2qaiA jePw== X-Gm-Message-State: ANoB5plCfqVo+QEYZcvB/uYqjIbhlheIsUdftkN1Mq56OQ7GLsw3SWSD Qy4bZ5znjvZJMYA5FLJtaHBIAropmMMQ1g== X-Google-Smtp-Source: AA0mqf7PczXTjFzVYPOC9/37fupbtNoWbMANj/R8OzV6339ryKVps8bZZoOTuQ0F5e75Ka/6bf9LUA== X-Received: by 2002:a05:622a:4a1b:b0:3a5:44e9:314f with SMTP id fv27-20020a05622a4a1b00b003a544e9314fmr32092497qtb.630.1669325852230; Thu, 24 Nov 2022 13:37:32 -0800 (PST) Received: from hurd ([2607:fad8:4:3::1003]) by smtp.gmail.com with ESMTPSA id m21-20020a05622a119500b00397e97baa96sm1210413qtk.0.2022.11.24.13.37.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 24 Nov 2022 13:37:31 -0800 (PST) From: Maxim Cournoyer References: <87pmdhx3lo.fsf@cbaines.net> <20221121010324.16069-1-maxim.cournoyer@gmail.com> <877cznjxl5.fsf_-_@gnu.org> Date: Thu, 24 Nov 2022 16:37:30 -0500 In-Reply-To: <877cznjxl5.fsf_-_@gnu.org> ("Ludovic =?UTF-8?Q?Court=C3=A8s?="'s message of "Tue, 22 Nov 2022 07:46:14 +0100") Message-ID: <87edtskp9h.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1669326379; 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-to: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=aoGtrgHNQbKS9bcyGJavu/fMsZj81JeJmiaRWM8HNt8=; b=Qeu9NFgpvt6uyFuUJk9MkTPVxMgbZp8ydwU06oOUEy6P6jJ4aw7OzrLRjZuMUhKeh918Fz c4aRr68wG/B22XLfbd4+LHtMWAqrFkWXNsO1GrAT2fdHYe/DsIjx5kwU4DDTvBbD9untcr xef2oV4kS1Jykm/ATgE3btIXTu61YqUQU54cY9o5vVvmeH8Y3xOWWtyzB8aGVehj7ROzCV xhTOW1nA/iGbW10zWYsBCN/spGa7/MFc3zJxILaOk4ISJ/7QjUTw9nJGT6XBBEq4rRcM1d RTT54H34XagtrKT7TO9AJOkOlDzlfqgXHJt0c7RTETbLeP0LkRl7ODOvk3HyMA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1669326379; a=rsa-sha256; cv=none; b=iCLMRn5GMMFcyt4k/sDK/jEQxpwbnyu7wlr5NskFHODhphcBLYGtARhSMeyXut2lu8TbVD 4uxI0KCM+upWZOTjCOnc7dOBGs8yX5f+7gjJFblnlLLoMmCnHvsaW9kbHu6VN7oLmt+HT0 0J5Z1XXPqNRPVuNmdicsPtmAJB5L7KqiUv5NtTqOuMt5UehZh4yrJz0PNOHq5Gh+6haUNK hVQ69fJnYxZOLp47mzAx8pr49iVdRzXmaKsHKzMgUxf3ndVZuyBeGgfnHVbZBmPRFqHerx 133kwINVI3/odBZFCpD/vWF3t/CwgV87qasMraqIHMlmEtUv8KbQJr7HnRZ9+A== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=R52rnHNL; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=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" X-Migadu-Spam-Score: 6.80 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=R52rnHNL; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=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" X-Migadu-Queue-Id: 5187621B43 X-Spam-Score: 6.80 X-Migadu-Scanner: scn0.migadu.com X-TUID: zXcX1iLyA+Cz Hi Ludo, Ludovic Court=C3=A8s writes: > Hi Maxim, > > Maxim Cournoyer skribis: > >> * gnu/packages/patches/linux-libre-infodocs-target.patch: New file. >> * gnu/local.mk (dist_patch_DATA): Register it. >> (linux-libre-6.0-source, linux-libre-5.15-source) >> (linux-libre-5.10-source): Apply above patch. >> (doc-supported?): > > Looks like these 3 lines are misplaced. Fixed. > >> * gnu/packages/linux.scm (make-linux-libre) [DOC-SUPPORTED?]: Add new pa= tch in >> the default patches used. Add a BUILD-DOC? argument. >> (make-linux-libre*): Add a BUILD-DOC? argument. Validate BUILD-DOC? for >> supported VERSION. >> [outputs]: New field. >> [phases]: Conditionally add the build-doc and install-doc phases. > > Nitpick: I=E2=80=99d write =E2=80=9C[arguments]=E2=80=9D rather than =E2= =80=9C[phases]=E2=80=9D. Adjusted. >> [native-inputs]: Conditionally add fontconfig, graphviz, python-wrapper, >> python-sphinx, python-sphinx-rtd-theme, texinfo and which. > > [...] > >> + #~((add-before 'configure 'build-doc >> + (lambda _ >> + (substitute* "Documentation/Makefile" >> + ;; Remove problematic environment check scrip= t. >> + ((".*scripts/sphinx-pre-install.*") "")) >> + (invoke "make" "infodocs" "htmldocs"))) >> + (add-after 'build-doc 'install-doc >> + (lambda _ >> + (with-directory-excursion "Documentation/output" >> + (let ((docdir (string-append >> + #$output:doc >> + "/share/doc/linux-libre/html")= )) >> + (mkdir-p docdir) >> + (copy-recursively "html" docdir)) >> + (invoke "make" "-C" "texinfo" "install-info" >> + (string-append "infodir=3D" #$output >> + "/share/info")))))) > > I would keep only Info documentation, which is much smaller than HTML. > This is what we do for every packages where we have that possibility. Done, like this: --8<---------------cut here---------------start------------->8--- modified gnu/packages/linux.scm @@ -815,8 +815,6 @@ (define* (make-linux-libre* version gnu-revision source= supported-systems (version version) (source source) (supported-systems supported-systems) - (outputs `("out" - ,@(if build-doc? '("doc") '()))) (build-system gnu-build-system) (arguments (list @@ -840,15 +838,10 @@ (define* (make-linux-libre* version gnu-revision sour= ce supported-systems (substitute* "Documentation/Makefile" ;; Remove problematic environment check script. ((".*scripts/sphinx-pre-install.*") "")) - (invoke "make" "infodocs" "htmldocs"))) + (invoke "make" "infodocs"))) (add-after 'build-doc 'install-doc (lambda _ (with-directory-excursion "Documentation/output" - (let ((docdir (string-append - #$output:doc - "/share/doc/linux-libre/html"))) - (mkdir-p docdir) - (copy-recursively "html" docdir)) (invoke "make" "-C" "texinfo" "install-info" (string-append "infodir=3D" #$output "/share/info")))))) --8<---------------cut here---------------end--------------->8--- (as well as python-sphinx-rtd, not shown above) and pushed. Thanks for the review! --=20 Thanks, Maxim