From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
To: Mathieu Lirzin <mthl@gnu.org>
Cc: Guix-devel <guix-devel@gnu.org>, Alex Kost <alezost@gmail.com>
Subject: Re: [PATCH] gnu: bind-utils: Build and install “nsupdate”.
Date: Thu, 21 Jan 2016 11:52:18 +0100 [thread overview]
Message-ID: <idjvb6n9pct.fsf@bimsb-sys02.mdc-berlin.net> (raw)
In-Reply-To: <87mvs7912x.fsf@gnu.org>
[-- Attachment #1: Type: text/plain, Size: 545 bytes --]
Mathieu Lirzin <mthl@gnu.org> writes:
> Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de> writes:
>
>> I agree, this looks nicer. Would you like to push this change? There
>> isn’t much left of my original patch ;)
>
> IIUC the main feature of this patch is adding the “nsupdate” thing
> (which should be described in the commit log by the way). So I think
> this patch is still yours. :)
Okay. Attached are three new patches. I thought I should better split
this up into separate commits for clarity.
How’s this?
[-- Attachment #2: 0001-gnu-bind-utils-Use-modify-phases-syntax.patch --]
[-- Type: text/x-patch, Size: 2357 bytes --]
From b276ca4c3940663137e4449144b2256f03e47d27 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
Date: Thu, 21 Jan 2016 11:20:30 +0100
Subject: [PATCH 1/3] gnu: bind-utils: Use "modify-phases" syntax.
* gnu/packages/dns.scm (bind-utils): Use "modify-phases" syntax.
---
gnu/packages/dns.scm | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm
index c83d16a..f7d6c88 100644
--- a/gnu/packages/dns.scm
+++ b/gnu/packages/dns.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayirli@gmail.com>
;;; Copyright © 2016 Mark H Weaver <mhw@netris.org>
+;;; Copyright © 2016 Ricardo Wurmus <rekado@elephly.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -91,19 +92,17 @@ and BOOTP/TFTP for network booting of diskless machines.")
(string-append "--with-pkcs11="
(assoc-ref %build-inputs "p11-kit")))
#:phases
- (alist-replace
- 'build
- (lambda _
- (and (zero? (system* "make" "-C" "lib/dns"))
- (zero? (system* "make" "-C" "lib/isc"))
- (zero? (system* "make" "-C" "lib/bind9"))
- (zero? (system* "make" "-C" "lib/isccfg"))
- (zero? (system* "make" "-C" "lib/lwres"))
- (zero? (system* "make" "-C" "bin/dig"))))
- (alist-replace
- 'install
- (lambda _ (zero? (system* "make" "-C" "bin/dig" "install")))
- %standard-phases))))
+ (modify-phases %standard-phases
+ (replace 'build
+ (lambda _
+ (and (zero? (system* "make" "-C" "lib/dns"))
+ (zero? (system* "make" "-C" "lib/isc"))
+ (zero? (system* "make" "-C" "lib/bind9"))
+ (zero? (system* "make" "-C" "lib/isccfg"))
+ (zero? (system* "make" "-C" "lib/lwres"))
+ (zero? (system* "make" "-C" "bin/dig")))))
+ (replace 'install
+ (lambda _ (zero? (system* "make" "-C" "bin/dig" "install")))))))
(home-page "https://www.isc.org/downloads/bind/")
(synopsis "Tools for querying nameservers")
(description
--
2.1.0
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-gnu-bind-utils-Generalize-build-and-install-phases.patch --]
[-- Type: text/x-patch, Size: 2326 bytes --]
From 4c7f432edbd65abad749170a280d88181f533635 Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
Date: Thu, 21 Jan 2016 11:41:10 +0100
Subject: [PATCH 2/3] gnu: bind-utils: Generalize "build" and "install" phases.
* gnu/packages/dns.scm (bind-utils)[arguments]: Generalize "build" and
"install" phases.
---
gnu/packages/dns.scm | 28 +++++++++++++++++-----------
1 file changed, 17 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm
index f7d6c88..dfdd1df 100644
--- a/gnu/packages/dns.scm
+++ b/gnu/packages/dns.scm
@@ -91,18 +91,24 @@ and BOOTP/TFTP for network booting of diskless machines.")
(assoc-ref %build-inputs "mysql"))
(string-append "--with-pkcs11="
(assoc-ref %build-inputs "p11-kit")))
+ #:modules ((srfi srfi-1)
+ (srfi srfi-26)
+ ,@%gnu-build-system-modules)
#:phases
- (modify-phases %standard-phases
- (replace 'build
- (lambda _
- (and (zero? (system* "make" "-C" "lib/dns"))
- (zero? (system* "make" "-C" "lib/isc"))
- (zero? (system* "make" "-C" "lib/bind9"))
- (zero? (system* "make" "-C" "lib/isccfg"))
- (zero? (system* "make" "-C" "lib/lwres"))
- (zero? (system* "make" "-C" "bin/dig")))))
- (replace 'install
- (lambda _ (zero? (system* "make" "-C" "bin/dig" "install")))))))
+ (let ((libs '("dns" "isc" "bind9" "isccfg" "lwres"))
+ (bins '("dig")))
+ (modify-phases %standard-phases
+ (replace 'build
+ (lambda _
+ (every (lambda (dir)
+ (zero? (system* "make" "-C" dir)))
+ (append (map (cut string-append "lib/" <>) libs)
+ (map (cut string-append "bin/" <>) bins)))))
+ (replace 'install
+ (lambda _
+ (every (lambda (dir)
+ (zero? (system* "make" "-C" dir "install")))
+ (map (cut string-append "bin/" <>) bins))))))))
(home-page "https://www.isc.org/downloads/bind/")
(synopsis "Tools for querying nameservers")
(description
--
2.1.0
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #4: 0003-gnu-bind-utils-Build-and-install-nsupdate.patch --]
[-- Type: text/x-patch, Size: 929 bytes --]
From 6bd7b2a30ef1f128097c2ff4030e465e3955a34f Mon Sep 17 00:00:00 2001
From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
Date: Thu, 21 Jan 2016 11:42:17 +0100
Subject: [PATCH 3/3] gnu: bind-utils: Build and install "nsupdate".
* gnu/packages/dns.scm (bind-utils)[arguments]: Also build and install
"nsupdate" executable.
---
gnu/packages/dns.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm
index dfdd1df..ef07f30 100644
--- a/gnu/packages/dns.scm
+++ b/gnu/packages/dns.scm
@@ -96,7 +96,7 @@ and BOOTP/TFTP for network booting of diskless machines.")
,@%gnu-build-system-modules)
#:phases
(let ((libs '("dns" "isc" "bind9" "isccfg" "lwres"))
- (bins '("dig")))
+ (bins '("dig" "nsupdate")))
(modify-phases %standard-phases
(replace 'build
(lambda _
--
2.1.0
next prev parent reply other threads:[~2016-01-21 10:52 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-13 15:11 [PATCH] gnu: bind-utils: Build and install “nsupdate” Ricardo Wurmus
2016-01-14 0:46 ` Mathieu Lirzin
2016-01-14 8:59 ` Alex Kost
2016-01-14 11:53 ` Ricardo Wurmus
2016-01-14 23:46 ` Mathieu Lirzin
2016-01-21 10:52 ` Ricardo Wurmus [this message]
2016-01-21 13:14 ` Mathieu Lirzin
2016-01-21 14:58 ` Ricardo Wurmus
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=idjvb6n9pct.fsf@bimsb-sys02.mdc-berlin.net \
--to=ricardo.wurmus@mdc-berlin.de \
--cc=alezost@gmail.com \
--cc=guix-devel@gnu.org \
--cc=mthl@gnu.org \
/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 external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.