From mboxrd@z Thu Jan  1 00:00:00 1970
From: Mathieu Lirzin <mthl@gnu.org>
Subject: Re: [PATCH] gnu: bind-utils: Build and install =?utf-8?B?4oCcbnN1?=
	=?utf-8?B?cGRhdGXigJ0u?=
Date: Thu, 14 Jan 2016 01:46:41 +0100
Message-ID: <8760yxt2by.fsf@gnu.org>
References: <idjd1t5frak.fsf@bimsb-sys02.mdc-berlin.net>
Mime-Version: 1.0
Content-Type: text/plain
Return-path: <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:54775)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mthl@gnu.org>) id 1aJW3r-0003ho-Gu
	for guix-devel@gnu.org; Wed, 13 Jan 2016 19:46:48 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mthl@gnu.org>) id 1aJW3o-0003O6-8G
	for guix-devel@gnu.org; Wed, 13 Jan 2016 19:46:47 -0500
Received: from v-zimmta02.u-bordeaux.fr ([147.210.215.20]:52800)
	by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <mthl@gnu.org>)
	id 1aJW3o-0003O2-0t
	for guix-devel@gnu.org; Wed, 13 Jan 2016 19:46:44 -0500
In-Reply-To: <idjd1t5frak.fsf@bimsb-sys02.mdc-berlin.net> (Ricardo Wurmus's
	message of "Wed, 13 Jan 2016 16:11:15 +0100")
List-Id: "Development of GNU Guix and the GNU System distribution."
	<guix-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/guix-devel>
List-Post: <mailto:guix-devel@gnu.org>
List-Help: <mailto:guix-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-devel>,
	<mailto:guix-devel-request@gnu.org?subject=subscribe>
Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org
To: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
Cc: Guix-devel <guix-devel@gnu.org>

Hi,

Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de> writes:

>>From ba328617777728c3534be6796b6b32a9a90954b6 Mon Sep 17 00:00:00 2001
> From: Ricardo Wurmus <ricardo.wurmus@mdc-berlin.de>
> Date: Wed, 13 Jan 2016 16:06:36 +0100
> Subject: [PATCH] gnu: bind-utils: Build and install "nsupdate".
>
> * gnu/packages/dns.scm (bind-utils)[arguments]: Generalize "build" and
>   "install" phases.
> ---
>  gnu/packages/dns.scm | 105 ++++++++++++++++++++++++++++-----------------------
>  1 file changed, 58 insertions(+), 47 deletions(-)
>
> diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm
> index 8357dad..0a42722 100644
> --- a/gnu/packages/dns.scm
> +++ b/gnu/packages/dns.scm
[...]
> +      (arguments
> +       `(#:tests? #f ; no test phase implemented
> +         #:configure-flags
> +         (list (string-append "--with-openssl="
> +                              (assoc-ref %build-inputs "openssl"))
> +               (string-append "--with-dlz-mysql="
> +                              (assoc-ref %build-inputs "mysql"))
> +               (string-append "--with-pkcs11="
> +                              (assoc-ref %build-inputs "p11-kit")))

What about:

       #:configure-flags
       (map (lambda (opt val)
              (string-append opt (assoc-ref %build-inputs val)))
            '("--with-openssl=" "--with-dlz-mysql=" "--with-pkcs11=")
            '("openssl" "mysql" "p11-kit"))

> +         #:modules ((srfi srfi-1)
> +                    (srfi srfi-26)
> +                    ,@%gnu-build-system-modules)
> +         #:phases
> +         (modify-phases %standard-phases
> +           (replace 'build
> +             (lambda _
> +               (fold (lambda (dir pass)
> +                       (and pass (zero? (system* "make" "-C" dir))))
> +                     #t
> +                     (append
> +                      (map (cut string-append "lib/" <>)
> +                           (list ,@libs))
> +                      (map (cut string-append "bin/" <>)
> +                           (list ,@bins))))))
> +           (replace 'install
> +             (lambda _
> +               (fold (lambda (dir pass)
> +                       (and pass (zero? (system* "make" "-C" dir "install"))))
> +                     #t
> +                     (map (cut string-append "bin/" <>)
> +                          (list ,@bins))))))))

and this:

       (let ((libs '("dns" "isc" "bind9" "isccfg" "lwres"))
             (bins '("dig" "nsupdate")))
         (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))))))))


Otherwise LGTM.

--
Mathieu Lirzin