GNU bug report logs - #43823
[PATCH 0/3] Knot: Enable DoH; build Info manual; work on aarch64-linux

Previous Next

Full log

Message #11 received at 43823 <at> debbugs.gnu.org (full text, mbox):

From: Simon South <simon <at> simonsouth.net>
To: 43823 <at> debbugs.gnu.org
Cc: me <at> tobias.gr, simon <at> simonsouth.net
Subject: [PATCH 2/3] gnu: knot: Build the Info manual.
Date: Mon,  5 Oct 2020 20:27:47 -0400

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

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.