amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "gnu: Add 'file' as a native-input on MIPS for some packages."

Browse source 
This reverts commit c3114b7567.
This commit is contained in:
Mark H Weaver 2014-08-21 21:49:36 -04:00
parent c3114b7567
commit fa5731baab
4 changed files with 25 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

20
gnu/packages/admin.scm
View file

@ -29,7 +29,6 @@
#:use-module (guix build-system trivial)
#:use-module (gnu packages)
#:use-module (gnu packages base)
#:use-module (gnu packages file)
#:use-module (gnu packages ncurses)
#:use-module (gnu packages readline)
#:use-module (gnu packages linux)
@ -649,7 +648,18 @@ system administrator.")
"")
(("^install: (.*)install-sudoers(.*)" _ before after)
;; Don't try to create /etc/sudoers.
(string-append "install: " before after "\n"))))
(string-append "install: " before after "\n")))
;; XXX FIXME sudo 1.8.10p3 was bootstrapped with a
;; prerelease libtool, which fails on MIPS in the absence
;; of /usr/bin/file. As a temporary workaround, we patch
;; the configure script to hardcode use of the little
;; endian N32 ABI on MIPS.
,@(if (equal? "mips64el-linux" (or (%current-target-system)
(%current-system)))
'((substitute* "configure"
(("\\$emul") "elf32ltsmipn32")))
'()))
%standard-phases)
;; XXX: The 'testsudoers' test series expects user 'root' to exist, but
@ -659,12 +669,6 @@ system administrator.")
`(("groff" ,groff)
("linux-pam" ,linux-pam)
("coreutils" ,coreutils)))
(native-inputs
`(;; 'file' is needed by the pre-release libtool on MIPS.
,@(if (equal? "mips64el-linux" (or (%current-target-system)
(%current-system)))
`(("file" ,file))
'())))
(home-page "http://www.sudo.ws/")
(synopsis "Run commands as root")
(description