me/guix
Archived
1
0
Fork 0
Code Activity

gnu: util-linux: Remove cross-compilation workaround.

Browse source 
* gnu/packages/linux.scm (util-linux)[arguments]: Look for /etc/services in
both NATIVE-INPUTS and INPUTS, instead of by input label.  Remove unused variable.
[inputs]: When cross-compiling, don't add NET-BASE.
This commit is contained in:
Marius Bakke 2021-07-29 13:51:04 +02:00
parent ec0a244417
commit cdd3141f19
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
gnu/packages/linux.scm
View file

@ -1787,13 +1787,13 @@ providing the system administrator with some help in common tasks.")
(("\"/bin/umount\"") (("\"/bin/umount\"")
(string-append "\"" out "/bin/umount\"")))))) (string-append "\"" out "/bin/umount\""))))))
(add-before 'check 'pre-check (add-before 'check 'pre-check
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key native-inputs inputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")) (let ((services (search-input-file (or native-inputs inputs)
(net (assoc-ref inputs "net-base"))) "etc/services")))
;; Change the test to refer to the right file. ;; Change the test to refer to the right file.
(substitute* "tests/ts/misc/mcookie" (substitute* "tests/ts/misc/mcookie"
(("/etc/services") (("/etc/services")
(string-append net "/etc/services"))) services))
;; The C.UTF-8 locale does not exist in our libc. ;; The C.UTF-8 locale does not exist in our libc.
(substitute* "tests/ts/column/invalid-multibyte" (substitute* "tests/ts/column/invalid-multibyte"
@ -1837,12 +1837,7 @@ providing the system administrator with some help in common tasks.")
"\\.pc$") "\\.pc$")
(("^(exec_)?prefix=.*") "")))))))) (("^(exec_)?prefix=.*") ""))))))))
(inputs `(("zlib" ,zlib) (inputs `(("zlib" ,zlib)
("ncurses" ,ncurses) ("ncurses" ,ncurses)))
;; XXX: This is so that the 'pre-check' phase can find it.
,@(if (%current-target-system)
`(("net-base" ,net-base))
'())))
(native-inputs (native-inputs
`(("perl" ,perl) `(("perl" ,perl)
("net-base" ,net-base))) ;for tests ("net-base" ,net-base))) ;for tests