mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 05:18:07 -05:00
gnu: Rely on 'file' implicit input and 'patch-usr-bin-file'.
* gnu/packages/admin.scm (sudo): * gnu/packages/gawk.scm (gawk): Remove workaround on MIPS. * gnu/packages/mcrypt.scm (mcrypt, libmhash): * gnu/packages/file.scm (file): Remove 'file' from native-inputs. * gnu/packages/mc.scm (mc): * gnu/packages/pretty-print.scm (a2ps, trueprint, source-highlight): * gnu/packages/image.scm (libtiff): Remove 'file' from native-inputs. Remove 'patch-configure' phase.
This commit is contained in:
Mark H Weaver
parent
8a0576f175
commit
c198872b99
7 changed files with 51 additions and 118 deletions
|
|
@ -648,18 +648,7 @@ (define-public sudo
|
|||
"")
|
||||
(("^install: (.*)install-sudoers(.*)" _ before after)
|
||||
;; Don't try to create /etc/sudoers.
|
||||
(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")))
|
||||
'()))
|
||||
(string-append "install: " before after "\n"))))
|
||||
%standard-phases)
|
||||
|
||||
;; XXX: The 'testsudoers' test series expects user 'root' to exist, but
|
||||
|
|
|
|||
|
|
@ -35,9 +35,6 @@ (define-public file
|
|||
(sha256 (base32
|
||||
"01xz106biz6x4h5ilymg5v3367djvgnfp4lm87132cjqdmqgn6b5"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
;; This package depends upon a native install of itself.
|
||||
(if (%current-target-system) `(("file" ,file)) '() ))
|
||||
(synopsis "file, a file type guesser")
|
||||
(description
|
||||
"The file command is a file type guesser, a command-line tool that tells
|
||||
|
|
|
|||
|
|
@ -55,17 +55,6 @@ (define-public gawk
|
|||
'((substitute* "extension/Makefile.in"
|
||||
(("^.*: check-for-shared-lib-support" match)
|
||||
(string-append "### " match))))
|
||||
'())
|
||||
|
||||
;; XXX FIXME gawk 4.1.1 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* "extension/configure"
|
||||
(("\\$emul") "elf32ltsmipn32")))
|
||||
'())))
|
||||
%standard-phases)))
|
||||
(inputs `(("libsigsegv" ,libsigsegv)
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@
|
|||
(define-module (gnu packages image)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages file)
|
||||
#:use-module ((guix licenses) #:renamer (symbol-prefix-proc 'license:))
|
||||
#:use-module (guix packages)
|
||||
#:use-module (guix download)
|
||||
|
|
@ -97,20 +96,11 @@ (define-public libtiff
|
|||
(inputs `(("zlib" ,zlib)
|
||||
("libjpeg-8" ,libjpeg-8)))
|
||||
;; currently does not compile with libjpeg version 9
|
||||
(native-inputs `(("file" ,file)))
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
(list (string-append "--with-jpeg-include-dir="
|
||||
(assoc-ref %build-inputs "libjpeg-8")
|
||||
"/include"))
|
||||
#:phases
|
||||
(alist-cons-before
|
||||
'configure 'patch-configure
|
||||
(lambda _
|
||||
(substitute* "configure"
|
||||
(("`/usr/bin/file")
|
||||
(string-append "`" (which "file")))))
|
||||
%standard-phases)))
|
||||
"/include"))))
|
||||
(synopsis "Libtiff, a library for handling TIFF files")
|
||||
(description
|
||||
"Libtiff provides support for the Tag Image File Format (TIFF), a format
|
||||
|
|
|
|||
|
|
@ -28,7 +28,6 @@ (define-module (gnu packages mc)
|
|||
#:use-module (gnu packages ssh)
|
||||
#:use-module (gnu packages pkg-config)
|
||||
#:use-module (gnu packages check)
|
||||
#:use-module (gnu packages file)
|
||||
#:use-module (gnu packages perl))
|
||||
|
||||
(define-public mc
|
||||
|
|
@ -46,7 +45,6 @@ (define-public mc
|
|||
(patches (list (search-patch "mc-fix-ncurses-build.patch")))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs `(("pkg-config" ,pkg-config)
|
||||
("file" ,file)
|
||||
("perl" ,perl)))
|
||||
(inputs `(("aspell" ,aspell)
|
||||
("ncurses" ,ncurses)
|
||||
|
|
@ -55,14 +53,7 @@ (define-public mc
|
|||
("check" ,check)))
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
'("--with-screen=ncurses" "--enable-aspell")
|
||||
#:phases
|
||||
(alist-cons-before
|
||||
'configure 'patch-configure
|
||||
(lambda _
|
||||
(substitute* "configure"
|
||||
(("/usr/bin/file") (which "file"))))
|
||||
%standard-phases)))
|
||||
'("--with-screen=ncurses" "--enable-aspell")))
|
||||
(home-page "http://www.midnight-commander.org")
|
||||
(synopsis "Graphical file manager")
|
||||
(description
|
||||
|
|
|
|||
|
|
@ -23,8 +23,7 @@ (define-module (gnu packages mcrypt)
|
|||
#:use-module (guix build-system gnu)
|
||||
#:use-module (gnu packages)
|
||||
#:use-module (gnu packages compression)
|
||||
#:use-module (gnu packages perl)
|
||||
#:use-module (gnu packages file))
|
||||
#:use-module (gnu packages perl))
|
||||
|
||||
(define-public mcrypt
|
||||
(package
|
||||
|
|
@ -68,7 +67,6 @@ (define-public libmcrypt
|
|||
(base32
|
||||
"0gipgb939vy9m66d3k8il98rvvwczyaw2ixr8yn6icds9c3nrsz4"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs `(("file" ,file)))
|
||||
(home-page "http://mcrypt.sourceforge.net/")
|
||||
(synopsis "Encryption algorithm library")
|
||||
(description
|
||||
|
|
@ -95,8 +93,7 @@ (define-public libmhash
|
|||
(patches (list (search-patch "mhash-keygen-test-segfault.patch")))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
`(("file" ,file)
|
||||
("perl" ,perl))) ;for tests
|
||||
`(("perl" ,perl))) ;for tests
|
||||
(home-page "http://mhash.sourceforge.net/")
|
||||
(synopsis "Thread-safe hash library")
|
||||
(description
|
||||
|
|
|
|||
|
|
@ -30,8 +30,7 @@ (define-module (gnu packages pretty-print)
|
|||
#:use-module (gnu packages bison)
|
||||
#:use-module (gnu packages flex)
|
||||
#:use-module (gnu packages gperf)
|
||||
#:use-module (gnu packages perl)
|
||||
#:use-module (gnu packages file))
|
||||
#:use-module (gnu packages perl))
|
||||
|
||||
(define-public a2ps
|
||||
(package
|
||||
|
|
@ -53,45 +52,39 @@ (define-public a2ps
|
|||
("imagemagick" ,imagemagick)))
|
||||
(native-inputs
|
||||
`(("gperf" ,gperf)
|
||||
("perl" ,perl)
|
||||
("file" ,file)))
|
||||
("perl" ,perl)))
|
||||
(arguments
|
||||
'(#:phases (alist-cons-before
|
||||
'configure 'patch-configure
|
||||
'build 'patch-scripts
|
||||
(lambda _
|
||||
(substitute* "configure"
|
||||
(("/usr/bin/file") (which "file"))))
|
||||
(substitute*
|
||||
'("afm/make_fonts_map.sh"
|
||||
"tests/defs"
|
||||
"tests/backup.tst"
|
||||
"tests/styles.tst")
|
||||
(("/bin/rm") (which "rm"))))
|
||||
(alist-cons-before
|
||||
'build 'patch-scripts
|
||||
(lambda _
|
||||
(substitute*
|
||||
'("afm/make_fonts_map.sh"
|
||||
"tests/defs"
|
||||
"tests/backup.tst"
|
||||
"tests/styles.tst")
|
||||
(("/bin/rm") (which "rm"))))
|
||||
(alist-cons-before
|
||||
'check 'patch-test-files
|
||||
;; Alternatively, we could unpatch the shebangs in tstfiles
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((perl (assoc-ref inputs "perl")))
|
||||
(substitute* '("tests/ps-ref/includeres.ps"
|
||||
"tests/gps-ref/includeres.ps")
|
||||
(("/usr/local/bin/perl")
|
||||
(string-append perl "/bin/perl"))))
|
||||
;; Some of the reference postscript contain a 'version 3'
|
||||
;; string that in inconsistent with the source text in the
|
||||
;; tstfiles directory. Erroneous search-and-replace?
|
||||
(substitute* '("tests/ps-ref/InsertBlock.ps"
|
||||
"tests/gps-ref/InsertBlock.ps"
|
||||
"tests/ps-ref/bookie.ps"
|
||||
"tests/gps-ref/bookie.ps")
|
||||
(("version 3") "version 2"))
|
||||
(substitute* '("tests/ps-ref/psmandup.ps"
|
||||
"tests/gps-ref/psmandup.ps")
|
||||
(("#! */bin/sh") (string-append
|
||||
"#!" (which "sh")))))
|
||||
%standard-phases)))))
|
||||
'check 'patch-test-files
|
||||
;; Alternatively, we could unpatch the shebangs in tstfiles
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(let ((perl (assoc-ref inputs "perl")))
|
||||
(substitute* '("tests/ps-ref/includeres.ps"
|
||||
"tests/gps-ref/includeres.ps")
|
||||
(("/usr/local/bin/perl")
|
||||
(string-append perl "/bin/perl"))))
|
||||
;; Some of the reference postscript contain a 'version 3'
|
||||
;; string that in inconsistent with the source text in the
|
||||
;; tstfiles directory. Erroneous search-and-replace?
|
||||
(substitute* '("tests/ps-ref/InsertBlock.ps"
|
||||
"tests/gps-ref/InsertBlock.ps"
|
||||
"tests/ps-ref/bookie.ps"
|
||||
"tests/gps-ref/bookie.ps")
|
||||
(("version 3") "version 2"))
|
||||
(substitute* '("tests/ps-ref/psmandup.ps"
|
||||
"tests/gps-ref/psmandup.ps")
|
||||
(("#! */bin/sh") (string-append
|
||||
"#!" (which "sh")))))
|
||||
%standard-phases))))
|
||||
(home-page "http://www.gnu.org/software/a2ps")
|
||||
(synopsis "Any file to PostScript, including pretty-printing")
|
||||
(description
|
||||
|
|
@ -115,16 +108,9 @@ (define-public trueprint
|
|||
(base32
|
||||
"13rkc0fga10xyf56yy9dnq95zndnfadkhxflnp24skszj21y8jqh"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs `(("file" ,file)))
|
||||
(arguments
|
||||
;; Must define DIFF_CMD for tests to pass
|
||||
'(#:configure-flags '("CPPFLAGS=-DDIFF_CMD=\\\"diff\\\"")
|
||||
#:phases (alist-cons-before
|
||||
'configure 'patch-configure
|
||||
(lambda _
|
||||
(substitute* "configure"
|
||||
(("/usr/bin/file") (which "file"))))
|
||||
%standard-phases)))
|
||||
'(#:configure-flags '("CPPFLAGS=-DDIFF_CMD=\\\"diff\\\"")))
|
||||
(home-page "http://www.gnu.org/software/trueprint")
|
||||
(synopsis "Pretty-print C sources and other plain text to PostScript")
|
||||
(description
|
||||
|
|
@ -178,34 +164,28 @@ (define-public source-highlight
|
|||
`(("boost" ,boost)))
|
||||
(native-inputs
|
||||
`(("bison" ,bison)
|
||||
("flex" ,flex)
|
||||
("file" ,file)))
|
||||
("flex" ,flex)))
|
||||
(arguments
|
||||
`(#:configure-flags
|
||||
(list (string-append "--with-boost="
|
||||
(assoc-ref %build-inputs "boost")))
|
||||
#:parallel-tests? #f ;There appear to be race conditions
|
||||
#:phases (alist-cons-before
|
||||
'configure 'patch-configure
|
||||
'check 'patch-test-files
|
||||
(lambda _
|
||||
(substitute* "configure"
|
||||
(("/usr/bin/file") (which "file"))))
|
||||
(alist-cons-before
|
||||
'check 'patch-test-files
|
||||
(lambda _
|
||||
;; Unpatch shebangs in test input so that source-highlight
|
||||
;; is still able to infer input language
|
||||
(substitute* '("tests/test.sh"
|
||||
"tests/test2.sh"
|
||||
"tests/test.tcl")
|
||||
(((string-append "#! *" (which "sh"))) "#!/bin/sh"))
|
||||
;; Initial patching unrecoverably removes whitespace, so
|
||||
;; remove it also in the comparison output.
|
||||
(substitute* '("tests/test.sh.html"
|
||||
"tests/test2.sh.html"
|
||||
"tests/test.tcl.html")
|
||||
(("#! */bin/sh") "#!/bin/sh")))
|
||||
%standard-phases))))
|
||||
;; Unpatch shebangs in test input so that source-highlight
|
||||
;; is still able to infer input language
|
||||
(substitute* '("tests/test.sh"
|
||||
"tests/test2.sh"
|
||||
"tests/test.tcl")
|
||||
(((string-append "#! *" (which "sh"))) "#!/bin/sh"))
|
||||
;; Initial patching unrecoverably removes whitespace, so
|
||||
;; remove it also in the comparison output.
|
||||
(substitute* '("tests/test.sh.html"
|
||||
"tests/test2.sh.html"
|
||||
"tests/test.tcl.html")
|
||||
(("#! */bin/sh") "#!/bin/sh")))
|
||||
%standard-phases)))
|
||||
(home-page "http://www.gnu.org/software/src-highlite")
|
||||
(synopsis "Produce a document with syntax highlighting from a source file")
|
||||
(description
|
||||
|
|
|
|||
Loading…
Reference in a new issue