[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
09/19: gnu: iproute2: Update to 5.19.0.
From: |
guix-commits |
Subject: |
09/19: gnu: iproute2: Update to 5.19.0. |
Date: |
Thu, 8 Sep 2022 15:45:19 -0400 (EDT) |
mbakke pushed a commit to branch core-updates
in repository guix.
commit cf76ab29c12229eb26fc006d9c412268d282f415
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Mon Sep 5 14:05:29 2022 +0200
gnu: iproute2: Update to 5.19.0.
* gnu/packages/linux.scm (iproute): Update to 5.19.0.
[arguments]: Use G-expression. Add 'configure' phase. Remove
patch-configure
phase. Remove DOCDIR and DESTDIR from #:make-flags.
---
gnu/packages/linux.scm | 64 ++++++++++++++++++++++++--------------------------
1 file changed, 31 insertions(+), 33 deletions(-)
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index ad6858cde7..fcabfbe73c 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -2703,7 +2703,7 @@ that the Ethernet protocol is much simpler than the IP
protocol.")
(define-public iproute
(package
(name "iproute2")
- (version "5.15.0")
+ (version "5.19.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -2711,40 +2711,38 @@ that the Ethernet protocol is much simpler than the IP
protocol.")
version ".tar.xz"))
(sha256
(base32
- "1zwin8sjnnwf2a9rjwzb3q8lkhcpy06s29sh05f5gxd7z6jy9qrq"))))
+ "14bp7mlyb5dizrzhd5hh5m9aq6xn1jlwaf9b5sjgglkzd96s7dr6"))))
(build-system gnu-build-system)
(arguments
- `( ;; There is a test suite, but it wants network namespaces and sudo.
- #:tests? #f
- #:make-flags (let ((out (assoc-ref %outputs "out")))
- (list "DESTDIR="
- (string-append "CC=" ,(cc-for-target))
- "HOSTCC=gcc"
- (string-append "BASH_COMPDIR=" out
- "/etc/bash_completion.d")
- (string-append "LIBDIR=" out "/lib")
- (string-append "HDRDIR=" out "/include")
- (string-append "SBINDIR=" out "/sbin")
- (string-append "CONFDIR=" out "/etc")
- (string-append "DOCDIR=" out "/share/doc/"
- ,name "-" ,version)
- (string-append "MANDIR=" out "/share/man")))
- #:phases (modify-phases %standard-phases
- (add-before 'install 'pre-install
- (lambda _
- ;; Don't attempt to create /var/lib/arpd.
- (substitute* "Makefile"
- (("^.*ARPDDIR.*$") ""))
- #t))
- (add-after 'unpack 'patch-configure
- (lambda _
- (let ((target ,(%current-target-system)))
- (substitute* "configure"
- (("pkg-config")
- (if target
- (string-append target "-pkg-config")
- "pkg-config")))
- #t))))))
+ (list
+ ;; There is a test suite, but it wants network namespaces and sudo.
+ #:tests? #f
+ #:make-flags
+ #~(let ((out #$output))
+ (list (string-append "CC=" #$(cc-for-target))
+ "HOSTCC=gcc"
+ (string-append "BASH_COMPDIR=" out
+ "/etc/bash_completion.d")
+ (string-append "LIBDIR=" out "/lib")
+ (string-append "HDRDIR=" out "/include")
+ (string-append "SBINDIR=" out "/sbin")
+ (string-append "CONFDIR=" out "/etc")
+ (string-append "MANDIR=" out "/share/man")))
+ #:phases
+ #~(modify-phases %standard-phases
+ (replace 'configure
+ (lambda* (#:key (configure-flags #~'()) #:allow-other-keys)
+ ;; The configure script does not understand some of the
+ ;; default options of gnu-build-system.
+ (setenv "PKG_CONFIG" #$(pkg-config-for-target))
+ (apply invoke "./configure"
+ "--prefix" #$output
+ configure-flags)))
+ (add-before 'install 'pre-install
+ (lambda _
+ ;; Don't attempt to create /var/lib/arpd.
+ (substitute* "Makefile"
+ (("^.*ARPDDIR.*$") "")))))))
(inputs
(list bdb iptables libmnl))
(native-inputs
- 17/19: gnu: Switch to GCC 11., (continued)
- 17/19: gnu: Switch to GCC 11., guix-commits, 2022/09/08
- 04/19: gnu: gsasl: Update to 2.2.0., guix-commits, 2022/09/08
- 13/19: gnu: doxygen: Update to 1.9.5., guix-commits, 2022/09/08
- 03/19: gnu: gawk: Update to 5.2.0., guix-commits, 2022/09/08
- 05/19: gnu: ninja: Update to 1.11.1., guix-commits, 2022/09/08
- 06/19: gnu: libxslt: Update to 1.1.37., guix-commits, 2022/09/08
- 11/19: gnu: fontconfig: Update to 2.14.0., guix-commits, 2022/09/08
- 15/19: gnu: glibc: Update to 2.35., guix-commits, 2022/09/08
- 19/19: gnu: clang-runtime: Remove obsolete workaround., guix-commits, 2022/09/08
- 16/19: syscalls: Adjust for glibc 2.34 and later., guix-commits, 2022/09/08
- 09/19: gnu: iproute2: Update to 5.19.0.,
guix-commits <=
- 14/19: gnu: nss, nss-certs: Update to 3.82., guix-commits, 2022/09/08