[bug#74035] [PATCH v2 04/26] gnu: maradns: Improve style.

[Zheng Junjie <zhengjunjie@iscas.ac.cn>]

[-- Attachment #1: Type: text/plain, Size: 3703 bytes --]

Nicolas Graves via Guix-patches via <guix-patches@gnu.org> writes:

> * gnu/packages/dns.scm (maradns)[arguments]: Use gexps.
> ---
>  gnu/packages/dns.scm | 58 ++++++++++++++++++++++----------------------
>  1 file changed, 29 insertions(+), 29 deletions(-)
>
> diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm
> index bd2df30f01..7a78fb0308 100644
> --- a/gnu/packages/dns.scm
> +++ b/gnu/packages/dns.scm
> @@ -1192,35 +1192,35 @@ (define-public maradns
>          (base32 "185kl7zfvnwzfpyxbzpwck13m468av74kbqijp0s4v33iicfpnvc"))))
>      (build-system gnu-build-system)
>      (arguments
> -     `(#:tests? #f                      ; need to be root to run tests
> -       #:make-flags
> -       (list
> -        ,(string-append "CC=" (cc-for-target))
> -        (string-append "PREFIX=" %output)
> -        (string-append "RPM_BUILD_ROOT=" %output))
> -       #:phases
> -       (modify-phases %standard-phases
> -         (replace 'configure
> -           (lambda* (#:key native-inputs target #:allow-other-keys)
> -             ;; make_32bit_tables generates a header file that is used during
> -             ;; compilation. Hence, during cross compilation, it should be
> -             ;; built for the host system.
> -             (when target
> -               (substitute* "rng/Makefile"
> -                 (("\\$\\(CC\\) -o make_32bit_tables")
> -                  (string-append (assoc-ref native-inputs "gcc")
> -                                 "/bin/gcc -o make_32bit_tables"))))
> -             (invoke "./configure")))
> -         (add-before 'install 'create-install-directories
> -           (lambda* (#:key outputs #:allow-other-keys)
> -             (let ((out (assoc-ref outputs "out")))
> -               (for-each (lambda (dir)
> -                           (mkdir-p (string-append out dir)))
> -                         (list "/bin" "/sbin" "/etc"
> -                               "/share/man/man1"
> -                               "/share/man/man5"
> -                               "/share/man/man8"))
> -               #t))))))
> +     (list
> +      #:tests? #f                      ; need to be root to run tests
> +      #:make-flags
> +      #~(list
> +         (string-append "CC=" #$(cc-for-target))
> +         (string-append "PREFIX=" #$output)
> +         (string-append "RPM_BUILD_ROOT=" #$output))
> +      #:phases
> +      #~(modify-phases %standard-phases
> +          (replace 'configure
> +            (lambda* (#:key native-inputs target #:allow-other-keys)
> +              ;; make_32bit_tables generates a header file that is used during
> +              ;; compilation. Hence, during cross compilation, it should be
> +              ;; built for the host system.
> +              (when target
> +                (substitute* "rng/Makefile"
> +                  (("\\$\\(CC\\) -o make_32bit_tables")
> +                   (string-append (search-input-file native-inputs "/bin/gcc")
> +                                  " -o make_32bit_tables"))))
> +              ;; ./configure doesn't support default flags
> +              (invoke "./configure")))
> +          (add-before 'install 'create-install-directories
> +            (lambda _
> +              (for-each (lambda (dir)
> +                          (mkdir-p (string-append #$output dir)))
> +                        (list "/bin" "/sbin" "/etc"
> +                              "/share/man/man1"
> +                              "/share/man/man5"
> +                              "/share/man/man8")))))))
>      (home-page "https://maradns.samiam.org")
>      (synopsis "Small lightweight DNS server")
>      (description "MaraDNS is a small and lightweight DNS server.  MaraDNS

apply.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]