From patchwork Sat Oct 26 22:42:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 69501 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 CF49727BBE9; Sat, 26 Oct 2024 23:44:11 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 11E4727BBE2 for ; Sat, 26 Oct 2024 23:44:10 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t4pVM-0008U7-9d; Sat, 26 Oct 2024 18:43:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t4pVK-0008Qk-Jm for guix-patches@gnu.org; Sat, 26 Oct 2024 18:43:30 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t4pVK-0007Cw-Ao for guix-patches@gnu.org; Sat, 26 Oct 2024 18:43:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=amrZS3GarlmkVIj6HiT3MN4ghng6ibDQEQGAPgPZ/3A=; b=inloHf77ACzPSS9f1RYKWszpmOOO7AvXkWiI1UoO5dWCMB8d73SIO8BMeJeYNtfy3+Cngi1qQUWGold4NoEDCq2xlb3HdS9KYNoQclVqfCR1tiVpq77p4/ZhXPnUXHb4ovFEnQIKJwFYnacVu3mDoemPAWqX33b8zE+hU1SuYHEwW6QTgxjk+CUIlb5DpfkCEkHy09tLrxVh331zzA3iiiaEWUczPQppOAwneQiFtE2XpRpr9Cql4CH7G1tUxpsjuJy7RuHbJT1UmfD+vJE4snKOQdX9EOwPabaCrFPAovZO9DPCbrB53x9SeaJWLAa7M5WSzIxsSddR/K2o7XLE+w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t4pVs-0006k4-3V for guix-patches@gnu.org; Sat, 26 Oct 2024 18:44:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#74035] [PATCH 03/24] gnu: maradns: Improve style. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Oct 2024 22:44:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74035 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74035@debbugs.gnu.org Cc: Nicolas Graves Received: via spool by 74035-submit@debbugs.gnu.org id=B74035.172998263325825 (code B ref 74035); Sat, 26 Oct 2024 22:44:04 +0000 Received: (at 74035) by debbugs.gnu.org; 26 Oct 2024 22:43:53 +0000 Received: from localhost ([127.0.0.1]:42999 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t4pVh-0006iS-7u for submit@debbugs.gnu.org; Sat, 26 Oct 2024 18:43:53 -0400 Received: from 17.mo550.mail-out.ovh.net ([87.98.179.142]:50475) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t4pVZ-0006hm-BC for 74035@debbugs.gnu.org; Sat, 26 Oct 2024 18:43:46 -0400 Received: from director10.ghost.mail-out.ovh.net (unknown [10.108.17.59]) by mo550.mail-out.ovh.net (Postfix) with ESMTP id 4XbZRy0Nw6z1SwB for <74035@debbugs.gnu.org>; Sat, 26 Oct 2024 22:43:10 +0000 (UTC) Received: from ghost-submission-5b5ff79f4f-j9l5v (unknown [10.111.182.47]) by director10.ghost.mail-out.ovh.net (Postfix) with ESMTPS id BAECA1FD6B; Sat, 26 Oct 2024 22:43:09 +0000 (UTC) Received: from ngraves.fr ([37.59.142.100]) by ghost-submission-5b5ff79f4f-j9l5v with ESMTPSA id 9hvbHX1wHWebUAAAgDeOYQ (envelope-from ); Sat, 26 Oct 2024 22:43:09 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-100R0039176b495-c296-493a-8c40-8c18fe095fa4, E6BF9B87AE7FBE7894246B3B643E76DCC103CD4C) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 86.246.19.221 Date: Sun, 27 Oct 2024 00:42:24 +0200 Message-ID: <20241026224300.30694-3-ngraves@ngraves.fr> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241026224300.30694-1-ngraves@ngraves.fr> References: <20241026224300.30694-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 8105916380142625506 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrvdejhedgudefucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepkeejhfegteegffeguddtveetudejfeevueetgeelffegjeehfeehudeiudegieejnecuffhomhgrihhnpehsrghmihgrmhdrohhrghenucfkphepuddvjedrtddrtddruddpkeeirddvgeeirdduledrvddvuddpfeejrdehledrudegvddruddttdenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjeegtdefheesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheehtddpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=amrZS3GarlmkVIj6HiT3MN4ghng6ibDQEQGAPgPZ/3A=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1729982590; v=1; b=38KULZTH+OWeFI0HOkeBo+CjcH0oGGXI22waMJnTVxt2YU5a0XPqBUUb+xa7txJtr5sPQrlM 3STTDd0b1rgrqp6/ZODoXqfcARJAU5o6Gcr1AOo8rNT7U9BrAh+rCa0/1q/oerynf8ThtoQBM+O gSiAorGAMeQELkX6u8GOQE3V0U+/ts1xrhGvPtKMkurpzMJaHI1f3IXYBhF5Fj8pL0swVmExw8N rDjDh537e/hjpTCiUA9EF0Ub5i6OTKGR/pODOM4qCDTZVsheu1i3D2nIHQKTSX+v/trjNZ9exs+ E5FyUfz6y+Ekx5qDD/ERZ/RhYxPBMBYgjUvKZtxPJ6McQ== X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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