From: Simon South <simon@simonsouth.net>
To: 43823@debbugs.gnu.org
Cc: me@tobias.gr, simon@simonsouth.net
Subject: [bug#43823] [PATCH 2/3] gnu: knot: Build the Info manual.
Date: Mon, 5 Oct 2020 20:27:47 -0400 [thread overview]
Message-ID: <201a17b6e4fe8abb50cf759fe50db1b339b17657.1601941844.git.simon@simonsouth.net> (raw)
In-Reply-To: <cover.1601941844.git.simon@simonsouth.net>
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
next prev parent reply other threads:[~2020-10-06 1:01 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-06 0:25 [bug#43823] [PATCH 0/3] Knot: Enable DoH; build Info manual; work on aarch64-linux Simon South
2020-10-06 0:27 ` [bug#43823] [PATCH 1/3] gnu: knot: Enable DNS-over-HTTPS support in kdig Simon South
2020-10-06 1:11 ` Tobias Geerinckx-Rice via Guix-patches via
2020-10-06 0:27 ` Simon South [this message]
2020-10-06 1:10 ` [bug#43823] [PATCH 2/3] gnu: knot: Build the Info manual Tobias Geerinckx-Rice via Guix-patches via
2020-10-06 0:27 ` [bug#43823] [PATCH 3/3] gnu: knot: Fix test failure on aarch64-linux Simon South
2020-10-06 1:15 ` Tobias Geerinckx-Rice via Guix-patches via
2020-10-06 1:08 ` [bug#43823] [PATCH 0/3] Knot: Enable DoH; build Info manual; work " Tobias Geerinckx-Rice via Guix-patches via
2020-10-06 13:56 ` [bug#43823] [PATCH v2 0/3] Knot: Enable DoH; build Info Manual; " Simon South
2020-10-06 13:56 ` [bug#43823] [PATCH v2 1/3] gnu: knot: Enable DNS-over-HTTPS support in kdig Simon South
2020-10-06 13:56 ` [bug#43823] [PATCH v2 2/3] gnu: knot: Build the Info manual Simon South
2020-10-06 13:56 ` [bug#43823] [PATCH v2 3/3] gnu: knot: Fix test failure on aarch64-linux Simon South
2020-10-06 14:41 ` bug#43823: [PATCH v2 0/3] Knot: Enable DoH; build Info Manual; work " Tobias Geerinckx-Rice via Guix-patches via
2020-10-06 14:49 ` [bug#43823] " Tobias Geerinckx-Rice via Guix-patches via
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=201a17b6e4fe8abb50cf759fe50db1b339b17657.1601941844.git.simon@simonsouth.net \
--to=simon@simonsouth.net \
--cc=43823@debbugs.gnu.org \
--cc=me@tobias.gr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).