From: Felix Lechner via Guix-patches via <guix-patches@gnu.org>
To: 62154@debbugs.gnu.org
Cc: Felix Lechner <felix.lechner@lease-up.com>
Subject: [bug#62154] [PATCH 2/4] gnu: inetutils: Convert to gexp.
Date: Sun, 12 Mar 2023 18:21:54 -0700 [thread overview]
Message-ID: <9068daeaf9a19703a1be22178c0e34cbf1d54cef.1678669618.git.felix.lechner@lease-up.com> (raw)
In-Reply-To: <cover.1678669618.git.felix.lechner@lease-up.com>
* gnu/packages/admin.scm (inetutils): Convert to gexp.
---
gnu/packages/admin.scm | 52 ++++++++++++++++++++++--------------------
1 file changed, 27 insertions(+), 25 deletions(-)
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 77c7577cfa..8147274b77 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -906,32 +906,34 @@ (define-public inetutils
"1ck81y6x0bk1qaripfsrbfzrrzaxkzp37ddpg8mgwzd5n6qxd28p"))))
(build-system gnu-build-system)
(arguments
- `(#:configure-flags '("--localstatedir=/var"
+ (list
+ #:configure-flags
+ #~(list "--localstatedir=/var"
- ;; Make sure 'PATH_PROCNET_DEV' gets defined when
- ;; cross-compiling (by default it does not.)
- ,@(if (%current-target-system)
- '("--with-path-procnet-dev=/proc/net/dev")
- '())
- ,@(if (hurd-target?)
- '("--disable-rcp"
- "--disable-rexec"
- "--disable-rexecd"
- "--disable-rlogin"
- "--disable-rlogind"
- "--disable-rsh"
- "--disable-rshd"
- "--disable-uucpd"
- "--disable-whois")
- '()))
- ;; Make sure that canonical "coreutils" package is not referred.
- #:make-flags
- (list (string-append "CPPFLAGS=-DPATHDEF_CP=\\\""
- (assoc-ref %build-inputs "coreutils*")
- "/bin/cp\\\""))
- ;; On some systems, 'libls.sh' may fail with an error such as:
- ;; "Failed to tell switch -a apart from -A".
- #:parallel-tests? #f))
+ ;; Make sure 'PATH_PROCNET_DEV' gets defined when
+ ;; cross-compiling (by default it does not.)
+ #$@(if (%current-target-system)
+ '("--with-path-procnet-dev=/proc/net/dev")
+ '())
+ #$@(if (hurd-target?)
+ '("--disable-rcp"
+ "--disable-rexec"
+ "--disable-rexecd"
+ "--disable-rlogin"
+ "--disable-rlogind"
+ "--disable-rsh"
+ "--disable-rshd"
+ "--disable-uucpd"
+ "--disable-whois")
+ '()))
+ ;; Make sure that canonical "coreutils" package is not referred.
+ #:make-flags
+ #~(list (string-append "CPPFLAGS=-DPATHDEF_CP=\\\""
+ #$(this-package-input "coreutils*")
+ "/bin/cp\\\""))
+ ;; On some systems, 'libls.sh' may fail with an error such as:
+ ;; "Failed to tell switch -a apart from -A".
+ #:parallel-tests? #f))
(inputs `(("coreutils*" ,coreutils)
("shadow" ,shadow) ;for login (used in telnetd and rlogind)
("ncurses" ,ncurses)
--
2.39.1
next prev parent reply other threads:[~2023-03-13 1:23 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-13 1:19 [bug#62154] [PATCH 0/4] gnu: inetutils: Update to 2.4 Felix Lechner via Guix-patches via
2023-03-13 1:21 ` [bug#62154] [PATCH 1/4] gnu: Update inetutils to 2.4; use tar.xz Felix Lechner via Guix-patches via
2023-03-13 1:21 ` Felix Lechner via Guix-patches via [this message]
2023-03-13 1:21 ` [bug#62154] [PATCH 3/4] gnu: inetutils: Use new-style inputs Felix Lechner via Guix-patches via
2023-03-13 1:21 ` [bug#62154] [PATCH 4/4] gnu: inetutils: Apply formatting rules (non-functional change) Felix Lechner via Guix-patches via
2024-01-20 19:50 ` bug#62154: " Maxim Cournoyer
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
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9068daeaf9a19703a1be22178c0e34cbf1d54cef.1678669618.git.felix.lechner@lease-up.com \
--to=guix-patches@gnu.org \
--cc=62154@debbugs.gnu.org \
--cc=felix.lechner@lease-up.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 public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).