From: Arun Isaac <arunisaac@systemreboot.net>
To: Mathieu Othacehe <m.othacehe@gmail.com>
Cc: 40767@debbugs.gnu.org
Subject: [bug#40767] [PATCH] gnu: Add maradns.
Date: Sat, 25 Apr 2020 23:33:25 +0530 [thread overview]
Message-ID: <cu7tv17v3wy.fsf@systemreboot.net> (raw)
In-Reply-To: <87v9lng2hx.fsf@gmail.com>
[-- 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 --]
next prev parent reply other threads:[~2020-04-25 18:04 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-22 13:29 [bug#40767] [PATCH] gnu: Add maradns Arun Isaac
2020-04-22 13:49 ` Mathieu Othacehe
2020-04-22 15:09 ` Efraim Flashner
2020-04-22 17:26 ` Mathieu Othacehe
2020-04-22 19:01 ` Arun Isaac
2020-04-23 8:37 ` Mathieu Othacehe
2020-04-24 22:13 ` Arun Isaac
2020-04-25 8:13 ` Mathieu Othacehe
2020-04-25 10:58 ` Arun Isaac
2020-04-25 12:43 ` Mathieu Othacehe
2020-04-25 18:03 ` Arun Isaac [this message]
2020-04-26 9:05 ` Mathieu Othacehe
2020-04-26 9:51 ` Arun Isaac
2020-04-24 22:15 ` bug#40767: " Arun Isaac
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=cu7tv17v3wy.fsf@systemreboot.net \
--to=arunisaac@systemreboot.net \
--cc=40767@debbugs.gnu.org \
--cc=m.othacehe@gmail.com \
/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.