futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: iproute2: Update to 5.19.0.

Browse Source 
* 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.
This commit is contained in:
Marius Bakke 2022-09-05 14:05:29 +02:00
parent d541f11d12
commit cf76ab29c1
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
gnu/packages/linux.scm
View File

@ -2703,7 +2703,7 @@ that the Ethernet protocol is much simpler than the IP protocol.")
(define-public iproute (define-public iproute
(package (package
(name "iproute2") (name "iproute2")
(version "5.15.0") (version "5.19.0")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -2711,40 +2711,38 @@ that the Ethernet protocol is much simpler than the IP protocol.")
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1zwin8sjnnwf2a9rjwzb3q8lkhcpy06s29sh05f5gxd7z6jy9qrq")))) "14bp7mlyb5dizrzhd5hh5m9aq6xn1jlwaf9b5sjgglkzd96s7dr6"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`( ;; There is a test suite, but it wants network namespaces and sudo. (list
#:tests? #f ;; There is a test suite, but it wants network namespaces and sudo.
#:make-flags (let ((out (assoc-ref %outputs "out"))) #:tests? #f
(list "DESTDIR=" #:make-flags
(string-append "CC=" ,(cc-for-target)) #~(let ((out #$output))
"HOSTCC=gcc" (list (string-append "CC=" #$(cc-for-target))
(string-append "BASH_COMPDIR=" out "HOSTCC=gcc"
"/etc/bash_completion.d") (string-append "BASH_COMPDIR=" out
(string-append "LIBDIR=" out "/lib") "/etc/bash_completion.d")
(string-append "HDRDIR=" out "/include") (string-append "LIBDIR=" out "/lib")
(string-append "SBINDIR=" out "/sbin") (string-append "HDRDIR=" out "/include")
(string-append "CONFDIR=" out "/etc") (string-append "SBINDIR=" out "/sbin")
(string-append "DOCDIR=" out "/share/doc/" (string-append "CONFDIR=" out "/etc")
,name "-" ,version) (string-append "MANDIR=" out "/share/man")))
(string-append "MANDIR=" out "/share/man"))) #:phases
#:phases (modify-phases %standard-phases #~(modify-phases %standard-phases
(add-before 'install 'pre-install (replace 'configure
(lambda _ (lambda* (#:key (configure-flags #~'()) #:allow-other-keys)
;; Don't attempt to create /var/lib/arpd. ;; The configure script does not understand some of the
(substitute* "Makefile" ;; default options of gnu-build-system.
(("^.*ARPDDIR.*$") "")) (setenv "PKG_CONFIG" #$(pkg-config-for-target))
#t)) (apply invoke "./configure"
(add-after 'unpack 'patch-configure "--prefix" #$output
(lambda _ configure-flags)))
(let ((target ,(%current-target-system))) (add-before 'install 'pre-install
(substitute* "configure" (lambda _
(("pkg-config") ;; Don't attempt to create /var/lib/arpd.
(if target (substitute* "Makefile"
(string-append target "-pkg-config") (("^.*ARPDDIR.*$") "")))))))
"pkg-config")))
#t))))))
(inputs (inputs
(list bdb iptables libmnl)) (list bdb iptables libmnl))
(native-inputs (native-inputs