From patchwork Sat Apr 25 18:03:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arun Isaac X-Patchwork-Id: 21471 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6030327BBE4; Sat, 25 Apr 2020 19:04:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 2E10527BBE1 for ; Sat, 25 Apr 2020 19:04:12 +0100 (BST) Received: from localhost ([::1]:42370 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jSP9v-00063H-KB for patchwork@mira.cbaines.net; Sat, 25 Apr 2020 14:04:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57182) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jSP9n-00060n-G7 for guix-patches@gnu.org; Sat, 25 Apr 2020 14:04:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.90_1) (envelope-from ) id 1jSP9m-0002Jt-Gl for guix-patches@gnu.org; Sat, 25 Apr 2020 14:04:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:48769) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jSP9m-0002J6-2R for guix-patches@gnu.org; Sat, 25 Apr 2020 14:04:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jSP9l-0002tG-VG for guix-patches@gnu.org; Sat, 25 Apr 2020 14:04:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#40767] [PATCH] gnu: Add maradns. Resent-From: Arun Isaac Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 25 Apr 2020 18:04:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 40767 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Mathieu Othacehe Cc: 40767@debbugs.gnu.org Received: via spool by 40767-submit@debbugs.gnu.org id=B40767.158783783411096 (code B ref 40767); Sat, 25 Apr 2020 18:04:01 +0000 Received: (at 40767) by debbugs.gnu.org; 25 Apr 2020 18:03:54 +0000 Received: from localhost ([127.0.0.1]:60315 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jSP9d-0002su-U5 for submit@debbugs.gnu.org; Sat, 25 Apr 2020 14:03:54 -0400 Received: from mugam.systemreboot.net ([139.59.75.54]:50702) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jSP9a-0002sk-VL for 40767@debbugs.gnu.org; Sat, 25 Apr 2020 14:03:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=systemreboot.net; s=default; h=Content-Type:MIME-Version:Message-ID:Date: References:In-Reply-To:Subject:Cc:To:From:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=JdhWan7LeE4KbG9Tx656HEpvPvoIslFxDsLC84k7HtM=; b=QwD+fsfwBiI+Oyy70G5BA4IXz 3S2dY53HH/fHFLVlG4DF3c0Hn3m2jemmxAMCNHuYTRJnsM/EUnpTEQwEhkQefzZGImCtDYG0IL7y4 KSvYcIyQBIedSZdifwByyz21M4OQJ7bL/QjVp7+WNn5CcoWzDCY/YtJM25M/YAMGmzVgE=; Received: from [192.168.2.1] (helo=steel) by systemreboot.net with esmtpsa (TLS1.3) tls TLS_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1jSP9H-000DMZ-9a; Sat, 25 Apr 2020 23:33:31 +0530 From: Arun Isaac In-Reply-To: <87v9lng2hx.fsf@gmail.com> References: <20200422132922.9539-1-arunisaac@systemreboot.net> <87lfmnock3.fsf@gmail.com> <87blnioawj.fsf@gmail.com> <87y2qkx9sh.fsf@gmail.com> <87v9lng2hx.fsf@gmail.com> Date: Sat, 25 Apr 2020 23:33:25 +0530 Message-ID: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Received-From: 209.51.188.43 X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches >> 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. From c155043bd6f78add7bbf660b6ad4a592be89b694 Mon Sep 17 00:00:00 2001 From: Arun Isaac 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