[bug#40767] [PATCH] gnu: Add maradns.

[bug#40767] [PATCH] gnu: Add maradns.

[Arun Isaac]

* gnu/packages/dns.scm (maradns): New variable.
---
 gnu/packages/dns.scm | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm
index 0f7227ad03..75be82b3b4 100644
--- a/gnu/packages/dns.scm
+++ b/gnu/packages/dns.scm
@@ -14,6 +14,7 @@
 ;;; Copyright © 2019 Chris Marusich <cmmarusich@gmail.com>
 ;;; Copyright © 2019 Rutger Helling <rhelling@mykolab.com>
 ;;; Copyright © 2020 Pierre Langlois <pierre.langlois@gmx.com>
+;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -949,3 +950,44 @@ could) directly register names in the Domain Name System (DNS).  Some examples
 of public suffixes are .com, .co.uk and pvt.k12.ma.us.  This is a list of all
 known public suffixes.")
       (license license:mpl2.0))))
+
+(define-public maradns
+  (package
+    (name "maradns")
+    (version "3.5.0004")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://maradns.samiam.org/download/"
+                           (version-major+minor version) "/"
+                           version "/maradns-" version ".tar.xz"))
+       (sha256
+        (base32
+         "1zv0i6m4m05ay5zlhwq1h88hgjq2d81cjanpnb3gyhr0xhmjwk6a"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:tests? #f ; need to be root to run tests
+       #:make-flags (list "CC=gcc"
+                          (string-append "PREFIX=" %output)
+                          (string-append "RPM_BUILD_ROOT=" %output))
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'configure
+           (lambda _
+             (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))))))
+    (home-page "https://maradns.samiam.org")
+    (synopsis "Small lightweight DNS server")
+    (description "MaraDNS is a small and lightweight DNS server.  MaraDNS
+consists of a UDP-only authoritative DNS server for hosting domains, and a UDP
+and TCP-capable recursive DNS server for finding domains on the internet.")
+    (license license:bsd-2)))
-- 
2.26.1

[bug#40767] [PATCH] gnu: Add maradns.

[Mathieu Othacehe]

Hello,

> +       #:make-flags (list "CC=gcc"
> +                          (string-append "PREFIX=" %output)
> +                          (string-append "RPM_BUILD_ROOT=" %output))

Hard-coding CC variable this way prevents cross-compilation. If you run:

--8<---------------cut here---------------start------------->8---
./pre-inst-env guix build maradns --target=aarch64-linux-gnu --target=aarch64-linux-gnu
--8<---------------cut here---------------end--------------->8---

you will obtain a native version of the binaries. Something like that
would work better:

--8<---------------cut here---------------start------------->8---
(string-append "CC=" (if target
                          (string-append (assoc-ref %build-inputs "cross-gcc")
                                         "/bin/" target "-gcc")
                          "gcc"))
--8<---------------cut here---------------end--------------->8---

As this is a recurrent problem we may need to put this snippet into a
gnu-build-system function?

Thanks,

Mathieu

[bug#40767] [PATCH] gnu: Add maradns.

[Efraim Flashner]

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

On Wed, Apr 22, 2020 at 03:49:32PM +0200, Mathieu Othacehe wrote:
> 
> Hello,
> 
> > +       #:make-flags (list "CC=gcc"
> > +                          (string-append "PREFIX=" %output)
> > +                          (string-append "RPM_BUILD_ROOT=" %output))
> 
> Hard-coding CC variable this way prevents cross-compilation. If you run:
> 
> --8<---------------cut here---------------start------------->8---
> ./pre-inst-env guix build maradns --target=aarch64-linux-gnu --target=aarch64-linux-gnu
> --8<---------------cut here---------------end--------------->8---
> 
> you will obtain a native version of the binaries. Something like that
> would work better:
> 
> --8<---------------cut here---------------start------------->8---
> (string-append "CC=" (if target
>                           (string-append (assoc-ref %build-inputs "cross-gcc")
>                                          "/bin/" target "-gcc")
>                           "gcc"))
> --8<---------------cut here---------------end--------------->8---
> 
> As this is a recurrent problem we may need to put this snippet into a
> gnu-build-system function?
> 
> Thanks,
> 
> Mathieu

would (which "gcc") work when cross compiling?

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

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

[bug#40767] [PATCH] gnu: Add maradns.

[Mathieu Othacehe]

> would (which "gcc") work when cross compiling?

When cross-compiling the cross gcc is named target-gcc
(aarch64-linux-gnu-gcc for instance), so (which "gcc") would return the
native compiler, not the cross one.

Note that when using autoconf/autotools, cross-compilation is working
fine because we pass "--host=target" and it manages to find the native
and cross-compiler from that.

This issue only arises when raw Makefile are using hard-coded CC=gcc to
build stuff.

Thanks,

Mathieu

[bug#40767] [PATCH] gnu: Add maradns.

[Arun Isaac]

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


> Hello,

Thanks for the patch review!

>> +       #:make-flags (list "CC=gcc"
>> +                          (string-append "PREFIX=" %output)
>> +                          (string-append "RPM_BUILD_ROOT=" %output))
>
> Hard-coding CC variable this way prevents cross-compilation.

Oops, I overlooked that.

> If you run:
>
> --8<---------------cut here---------------start------------->8---
> ./pre-inst-env guix build maradns --target=aarch64-linux-gnu --target=aarch64-linux-gnu
> --8<---------------cut here---------------end--------------->8---
>
> you will obtain a native version of the binaries. Something like that
> would work better:
>
> --8<---------------cut here---------------start------------->8---
> (string-append "CC=" (if target
>                           (string-append (assoc-ref %build-inputs "cross-gcc")
>                                          "/bin/" target "-gcc")
>                           "gcc"))
> --8<---------------cut here---------------end--------------->8---

Sure, I'll fix this. Any other changes?

> As this is a recurrent problem we may need to put this snippet into a
> gnu-build-system function?

I think that's a good idea. The build phase of the gnu-build-system
should include this snippet.

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

[bug#40767] [PATCH] gnu: Add maradns.

[Mathieu Othacehe]

Hello,

> Sure, I'll fix this. Any other changes?

No other than that, this LGTM :).

Mathieu

[bug#40767] [PATCH] gnu: Add maradns.

[Arun Isaac]

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


Pushed with discussed change. Thank you for the review!

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

bug#40767: [PATCH] gnu: Add maradns.

[Arun Isaac]

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


Closing this issue.

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

[bug#40767] [PATCH] gnu: Add maradns.

[Mathieu Othacehe]

Hello,

> Pushed with discussed change. Thank you for the review!

I still have the following error when cross-building for
aarch64-linux-gnu or arm-linux-gnueabihf:

--8<---------------cut here---------------start------------->8---
../rng/rng-alg-fst.c: In function ‘rngKeySetupEnc’:
../rng/rng-alg-fst.c:104:34: error: ‘Te4’ undeclared (first use in this function); did you mean ‘STe4’?
                                 (Te4[(temp >> 16) & 0xff] & 0xff000000) ^
                                  ^~~
                                  STe4
../rng/rng-alg-fst.c:104:34: note: each undeclared identifier is reported only once for each function it appears in
../rng/rng-alg-fst.c:125:27: error: ‘Te0’ undeclared (first use in this function); did you mean ‘Te4’?
                 STe0[i] = Te0[i];
                           ^~~
                           Te4
--8<---------------cut here---------------end--------------->8---

Also, please be careful to stay under the 78 column limit.

Could you have a look?

Thanks,

Mathieu

[bug#40767] [PATCH] gnu: Add maradns.

[Arun Isaac]

[-- Attachment #1.1: Type: text/plain, Size: 289 bytes --]


> I still have the following error when cross-building for
> aarch64-linux-gnu or arm-linux-gnueabihf:

Please find attached a patch fixing this issue.

> Also, please be careful to stay under the 78 column limit.

Yes, I checked before pushing. guix lint reported no warnings.

Thanks!


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-gnu-maradns-Fix-cross-compilation.patch --]
[-- Type: text/x-patch, Size: 2237 bytes --]

From 3b59165f196b32f130150db7a7167dc2fadae315 Mon Sep 17 00:00:00 2001
From: Arun Isaac <arunisaac@systemreboot.net>
Date: Sat, 25 Apr 2020 15:53:52 +0530
Subject: [PATCH] gnu: maradns: Fix cross compilation.

* gnu/packages/dns.scm (maradns)[native-inputs]: Add gcc when cross compiling.
[arguments]: Build make_32bit_tables for the host.
---
 gnu/packages/dns.scm | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm
index 80ed1f0b49..8cb6a2f3fa 100644
--- a/gnu/packages/dns.scm
+++ b/gnu/packages/dns.scm
@@ -43,6 +43,7 @@
   #:use-module (gnu packages crypto)
   #:use-module (gnu packages datastructures)
   #:use-module (gnu packages flex)
+  #:use-module (gnu packages gcc)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages groff)
   #:use-module (gnu packages groff)
@@ -979,7 +980,15 @@ known public suffixes.")
        #:phases
        (modify-phases %standard-phases
          (replace 'configure
-           (lambda _
+           (lambda* (#:key native-inputs #: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 ,(%current-target-system)
+               (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)
@@ -991,6 +1000,10 @@ known public suffixes.")
                                "/share/man/man5"
                                "/share/man/man8"))
                #t))))))
+    (native-inputs
+     `(,@(if (%current-target-system)
+             `(("gcc" ,gcc))
+             '())))
     (home-page "https://maradns.samiam.org")
     (synopsis "Small lightweight DNS server")
     (description "MaraDNS is a small and lightweight DNS server.  MaraDNS
-- 
2.26.1


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

[bug#40767] [PATCH] gnu: Add maradns.

[Mathieu Othacehe]

> Yes, I checked before pushing. guix lint reported no warnings.

Then we may have to fix guix lint because it seems to me that this
snippet is above limit:

--8<---------------cut here---------------start------------->8---
    (string-append (assoc-ref %build-inputs "cross-gcc")
                "/bin/" ,(%current-target-system) "-gcc")
--8<---------------cut here---------------end--------------->8---


Nice fix, thank you :)

>                                 "/share/man/man8"))
>                 #t))))))
> +    (native-inputs
> +     `(,@(if (%current-target-system)
> +             `(("gcc" ,gcc))
> +             '())))

You don't need this bit, the native gcc is also present when
cross-compiling. Otherwise, LGTM!

Mathieu

[bug#40767] [PATCH] gnu: Add maradns.

[Arun Isaac]

[-- Attachment #1.1: Type: text/plain, Size: 519 bytes --]


>> Yes, I checked before pushing. guix lint reported no warnings.
>
> Then we may have to fix guix lint because it seems to me that this
> snippet is above limit:

guix lint checks for lines longer than 90 characters. Perhaps that's the
new policy? See the function report-long-line in guix/lint.scm. It even
has a comment noting that we don't warn at 80 characters.

> You don't need this bit, the native gcc is also present when
> cross-compiling. Otherwise, LGTM!

Removed. Please find attached the updated patch.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: v2-0001-gnu-maradns-Fix-cross-compilation.patch --]
[-- Type: text/x-patch, Size: 1726 bytes --]

From c155043bd6f78add7bbf660b6ad4a592be89b694 Mon Sep 17 00:00:00 2001
From: Arun Isaac <arunisaac@systemreboot.net>
Date: Sat, 25 Apr 2020 15:53:52 +0530
Subject: [PATCH v2] gnu: maradns: Fix cross compilation.

* gnu/packages/dns.scm (maradns)[arguments]: Build make_32bit_tables for the
host.
---
 gnu/packages/dns.scm | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/dns.scm b/gnu/packages/dns.scm
index 80ed1f0b49..7364a1e885 100644
--- a/gnu/packages/dns.scm
+++ b/gnu/packages/dns.scm
@@ -43,6 +43,7 @@
   #:use-module (gnu packages crypto)
   #:use-module (gnu packages datastructures)
   #:use-module (gnu packages flex)
+  #:use-module (gnu packages gcc)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages groff)
   #:use-module (gnu packages groff)
@@ -979,7 +980,15 @@ known public suffixes.")
        #:phases
        (modify-phases %standard-phases
          (replace 'configure
-           (lambda _
+           (lambda* (#:key native-inputs #: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 ,(%current-target-system)
+               (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)
-- 
2.26.1


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

[bug#40767] [PATCH] gnu: Add maradns.

[Mathieu Othacehe]

> guix lint checks for lines longer than 90 characters. Perhaps that's the
> new policy? See the function report-long-line in guix/lint.scm. It even
> has a comment noting that we don't warn at 80 characters.

Yes it's to avoid false positives with hashes and URLs. On the other
hand, in .dir-locals.el, fill-column variable is set to 78. Maybe we
would need to be more explicit in the "Coding style" section of the
manual.

> -           (lambda _
> +           (lambda* (#:key native-inputs #: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 ,(%current-target-system)
> +               (substitute* "rng/Makefile"
> +                 (("\\$\\(CC\\) -o make_32bit_tables")
> +                  (string-append (assoc-ref native-inputs "gcc")
> +                                 "/bin/gcc -o make_32bit_tables"))))

Nitpicking, you can use the target argument instead of
%current-target-system, this way:

--8<---------------cut here---------------start------------->8---
(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")))))
--8<---------------cut here---------------end--------------->8---

Feel free to go ahead with this one,

Thanks,

Mathieu

[bug#40767] [PATCH] gnu: Add maradns.

[Arun Isaac]

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


>> guix lint checks for lines longer than 90 characters. Perhaps that's the
>> new policy? See the function report-long-line in guix/lint.scm. It even
>> has a comment noting that we don't warn at 80 characters.
>
> Yes it's to avoid false positives with hashes and URLs. On the other
> hand, in .dir-locals.el, fill-column variable is set to 78. Maybe we
> would need to be more explicit in the "Coding style" section of the
> manual.

Do please raise this in guix-devel and we could get some consensus on
this.

> Nitpicking, you can use the target argument instead of
> %current-target-system, this way:
>
> --8<---------------cut here---------------start------------->8---
> (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")))))
> --8<---------------cut here---------------end--------------->8---
>
> Feel free to go ahead with this one,

Pushed with suggested change. Thanks! :-)

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