From: "Ludovic Courtès" <ludo@gnu.org>
To: "B. Wilson" <elaexuotee@wilsonb.com>
Cc: 65936-done@debbugs.gnu.org
Subject: bug#65936: [PATCH] gnu: Add ipvsadm.
Date: Wed, 18 Oct 2023 23:00:53 +0200 [thread overview]
Message-ID: <87ttqn4pdm.fsf@gnu.org> (raw)
In-Reply-To: <20230914055514.19256-1-elaexuotee@wilsonb.com> (B. Wilson's message of "Thu, 14 Sep 2023 14:55:13 +0900")
[-- Attachment #1: Type: text/plain, Size: 251 bytes --]
"B. Wilson" <elaexuotee@wilsonb.com> skribis:
> * gnu/packages/linux.scm (ipvsadm): New variable.
I ran ‘guix style -S inputs’ and ‘guix style -S arguments’, and then I
had to edit it quite a bit (see below). Committed.
Ludo’.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 3596 bytes --]
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 08cc3823ed..457e41f303 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -10514,42 +10514,36 @@ (define-public ipvsadm
(name "ipvsadm")
(version "1.31")
(source
- (origin
- (method url-fetch)
- (uri (string-append "https://kernel.org/pub/linux/utils/kernel"
- "/ipvsadm/ipvsadm-" version ".tar.xz"))
- (sha256
- (base32 "1nyzpv1hx75k9lh0vfxfhc0p2fpqaqb38xpvs8sn88m1nljmw2hs"))))
+ (origin
+ (method url-fetch)
+ (uri (string-append "https://kernel.org/pub/linux/utils/kernel"
+ "/ipvsadm/ipvsadm-" version ".tar.xz"))
+ (sha256
+ (base32 "1nyzpv1hx75k9lh0vfxfhc0p2fpqaqb38xpvs8sn88m1nljmw2hs"))))
(build-system gnu-build-system)
- (native-inputs `(("linux-libre-headers" ,linux-libre-headers)
- ("pkg-config" ,pkg-config)))
- (inputs `(("libnl" ,libnl)
- ("popt" ,popt)))
+ (native-inputs (list linux-libre-headers pkg-config which))
+ (inputs (list libnl popt))
(arguments
- `(#:tests? #f
- #:make-flags
- (list (string-join
- (list "CFLAGS="
- (string-append "-I" (assoc-ref %build-inputs "libnl")
- "/include/libnl3")
- (string-append "-L" (assoc-ref %build-inputs "libnl")
- "/lib")
- "-fPIC")
- " ")
- (string-append "CC=" ,(cc-for-target))
- (string-append "SBIN=" (assoc-ref %outputs "out") "/sbin")
- (string-append "INIT=" (assoc-ref %outputs "out") "/etc/init.d")
- (string-append "MANDIR=" (assoc-ref %outputs "out") "/share/man"))
- #:phases
- (modify-phases %standard-phases
- (delete 'configure)
- (add-before 'build 'build-libs
- (lambda* (#:key inputs make-flags #:allow-other-keys)
- ;; XXX: libnl-* pkg-config checks are failing for some reason
- (invoke "sed" "-i" "68,74d" "Makefile")
- (apply invoke "make" "libs" make-flags))))))
+ (list #:tests? #f
+ #:parallel-build? #f ;build fails randomly with '-j'
+ #:make-flags
+ #~(list (string-join
+ (list "CFLAGS="
+ (string-append "-I"
+ #$(this-package-input "libnl")
+ "/include/libnl3")
+ (string-append "-L" #$(this-package-input "libnl")
+ "/lib")
+ "-fPIC")
+ " ")
+ (string-append "CC=" #$(cc-for-target))
+ (string-append "SBIN=" #$output "/sbin")
+ (string-append "INIT=" #$output "/etc/init.d")
+ (string-append "MANDIR=" #$output "/share/man"))
+ #:phases #~(modify-phases %standard-phases
+ (delete 'configure))))
(home-page "http://www.linuxvirtualserver.org/software/ipvs.html")
- (synopsis "IP Virtual Server administration utility")
+ (synopsis "IP virtual server administration utility")
(description "@code{ipvsadm(8)} is used to set up, maintain or inspect the
virtual server table in the Linux kernel. The Linux Virtual Server can be used
to build scalable network services based on a cluster of two or more nodes.")
next prev parent reply other threads:[~2023-10-18 21:01 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-14 5:55 [bug#65936] [PATCH] gnu: Add ipvsadm B. Wilson via Guix-patches via
2023-10-18 21:00 ` Ludovic Courtès [this message]
2023-10-20 15:09 ` x--- via Guix-patches via
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=87ttqn4pdm.fsf@gnu.org \
--to=ludo@gnu.org \
--cc=65936-done@debbugs.gnu.org \
--cc=elaexuotee@wilsonb.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.