TakeV/guix
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

gnu: util-linux: Disable setarch test on all architectures.

Browse source 
* gnu/packages/linux.scm (util-linux)[arguments]: Don't make the
disable-setarch-test phase conditional.  While at it, remove trailing #t's.
This commit is contained in:
Marius Bakke 2021-05-16 10:46:47 +02:00
parent 11284cb321
commit 52f4ba9617
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
1 changed files with 16 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
gnu/packages/linux.scm
View file

@ -1663,16 +1663,14 @@ (define-public util-linux
;; libraries below $exec_prefix when $libdir does not ;; libraries below $exec_prefix when $libdir does not
;; match any of the "usual" locations. Fix that. ;; match any of the "usual" locations. Fix that.
(("usrlib_execdir='\\$\\{exec_prefix\\}'\\$libdir") (("usrlib_execdir='\\$\\{exec_prefix\\}'\\$libdir")
"usrlib_execdir=$libdir")) "usrlib_execdir=$libdir"))))
#t))
(add-before 'build 'set-umount-file-name (add-before 'build 'set-umount-file-name
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
;; Tell 'eject' the right file name of 'umount'. ;; Tell 'eject' the right file name of 'umount'.
(let ((out (assoc-ref outputs "out"))) (let ((out (assoc-ref outputs "out")))
(substitute* "sys-utils/eject.c" (substitute* "sys-utils/eject.c"
(("\"/bin/umount\"") (("\"/bin/umount\"")
(string-append "\"" out "/bin/umount\""))) (string-append "\"" out "/bin/umount\""))))))
#t)))
(add-before 'check 'pre-check (add-before 'check 'pre-check
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")) (let ((out (assoc-ref outputs "out"))
@ -1684,23 +1682,18 @@ (define-public util-linux
;; 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"
(("C\\.UTF-8") "en_US.utf8")) (("C\\.UTF-8") "en_US.utf8")))))
#t))) (add-before 'check 'disable-setarch-test
;; TODO: Remove the conditional on the next rebuild cycle. (lambda _
,@(if (string-prefix? "arm" (%current-system)) ;; The setarch tests are unreliable in QEMU's user-mode
'((add-before 'check 'disable-setarch-test ;; emulation, which is our primary method of building
(lambda _ ;; ARMv7 packages. See
;; The setarch tests are unreliable in QEMU's ;; <https://github.com/karelzak/util-linux/issues/601>.
;; user-mode emulation, which is our primary (substitute* "tests/ts/misc/setarch"
;; method of building ARMv7 packages. (("ts_init_subtest.*" all)
;; <https://github.com/karelzak/util-linux/issues/601> (string-append
(substitute* "tests/ts/misc/setarch" all "\n"
(("ts_init_subtest.*" all) "ts_skip \"setarch tests are unreliable under QEMU\"")))))
(string-append
all "\n"
"ts_skip \"setarch tests are unreliable under QEMU\"")))
#t)))
'())
(add-after 'install 'move-static-libraries (add-after 'install 'move-static-libraries
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((lib (assoc-ref outputs "lib")) (let ((lib (assoc-ref outputs "lib"))
@ -1719,9 +1712,7 @@ (define-public util-linux
;; files so that Libtool does the right thing when both ;; files so that Libtool does the right thing when both
;; the shared and static library is available. ;; the shared and static library is available.
(substitute* (find-files "lib" "\\.la$") (substitute* (find-files "lib" "\\.la$")
(("old_library=.*") "old_library=''\n"))) (("old_library=.*") "old_library=''\n"))))))
#t)))
(add-after 'install 'adjust-pkg-config-files (add-after 'install 'adjust-pkg-config-files
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((lib (assoc-ref outputs "lib"))) (let ((lib (assoc-ref outputs "lib")))
@ -1729,8 +1720,7 @@ (define-public util-linux
;; the pkg-config files to avoid a cyclic reference on "out". ;; the pkg-config files to avoid a cyclic reference on "out".
(substitute* (find-files (string-append lib "/lib/pkgconfig") (substitute* (find-files (string-append lib "/lib/pkgconfig")
"\\.pc$") "\\.pc$")
(("^(exec_)?prefix=.*") ""))) (("^(exec_)?prefix=.*") ""))))))))
#t)))))
(inputs `(("zlib" ,zlib) (inputs `(("zlib" ,zlib)
("ncurses" ,ncurses) ("ncurses" ,ncurses)