From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id kNziGf7Be19SXAAA0tVLHw (envelope-from ) for ; Tue, 06 Oct 2020 01:01:50 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id oAGoFf7Be18eBgAAbx9fmQ (envelope-from ) for ; Tue, 06 Oct 2020 01:01:50 +0000 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 B08A7940390 for ; Tue, 6 Oct 2020 01:01:49 +0000 (UTC) Received: from localhost ([::1]:55774 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kPavc-00052l-MQ for larch@yhetil.org; Mon, 05 Oct 2020 20:34:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49602) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kPaud-0004oi-8g for guix-patches@gnu.org; Mon, 05 Oct 2020 20:33:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39284) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kPauc-0005GP-Vt for guix-patches@gnu.org; Mon, 05 Oct 2020 20:33:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kPauc-00027U-TW for guix-patches@gnu.org; Mon, 05 Oct 2020 20:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43823] [PATCH 2/3] gnu: knot: Build the Info manual. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 06 Oct 2020 00:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43823 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43823@debbugs.gnu.org Cc: me@tobias.gr, simon@simonsouth.net Received: via spool by 43823-submit@debbugs.gnu.org id=B43823.16019443538092 (code B ref 43823); Tue, 06 Oct 2020 00:33:02 +0000 Received: (at 43823) by debbugs.gnu.org; 6 Oct 2020 00:32:33 +0000 Received: from localhost ([127.0.0.1]:50826 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kPau9-00026S-Dh for submit@debbugs.gnu.org; Mon, 05 Oct 2020 20:32:33 -0400 Received: from mailout.easymail.ca ([64.68.200.34]:46948) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kPau8-000268-7g for 43823@debbugs.gnu.org; Mon, 05 Oct 2020 20:32:32 -0400 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 033D820B2A; Tue, 6 Oct 2020 00:32:27 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo06-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo06-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id seFAxGGu9Uny; Tue, 6 Oct 2020 00:32:26 +0000 (UTC) Received: from localhost.localdomain (unknown [108.162.141.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id B24E7209FB; Tue, 6 Oct 2020 00:32:22 +0000 (UTC) From: Simon South Date: Mon, 5 Oct 2020 20:27:47 -0400 Message-Id: <201a17b6e4fe8abb50cf759fe50db1b339b17657.1601941844.git.simon@simonsouth.net> X-Mailer: git-send-email 2.25.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) 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" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 1.49 X-TUID: 7skUXDH6Pl9g This also silences a configure warning about the "sphinx-build" command being unavailable. * gnu/packages/dns.scm (knot)[arguments]: Add "build-info" and "install-info" phases. [native-inputs]: Add texinfo and python-sphinx. --- gnu/packages/dns.scm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm index d791c45f69..0eab03fbbd 100644 --- a/gnu/packages/dns.scm +++ b/gnu/packages/dns.scm @@ -69,6 +69,7 @@ #:use-module (gnu packages shells) #:use-module (gnu packages sphinx) #:use-module (gnu packages swig) + #:use-module (gnu packages texinfo) #:use-module (gnu packages tls) #:use-module (gnu packages web) #:use-module (gnu packages xml) @@ -841,6 +842,9 @@ Extensions} (DNSSEC).") ;; This is needed even when using ‘make config_dir=... install’. (substitute* "src/Makefile.in" (("\\$\\(INSTALL\\) -d") "true")) #t)) + (add-after 'build 'build-info + (lambda _ + (invoke "make" "info"))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -848,13 +852,18 @@ Extensions} (DNSSEC).") (etc (string-append doc "/examples/etc"))) (invoke "make" (string-append "config_dir=" etc) - "install"))))))) + "install")))) + (add-after 'install 'install-info + (lambda _ + (invoke "make" "install-info")))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) ("libtool" ,libtool) + ("makeinfo" ,texinfo) ("pkg-config" ,pkg-config) - ("ragel" ,ragel))) + ("ragel" ,ragel) + ("sphinx-build" ,python-sphinx))) (inputs `(("fstrm" ,fstrm) ("gnutls" ,gnutls) -- 2.28.0