gnu: mkfontdir: Fix aarch64 cross-compilation.
The packaged config.sub and config.guess do not have aarch64 support. Replace them by the ones from automake. * gnu/packages/xorg.scm (mkfontdir)[arguments]: Replace outdated config.sub and config.guess, by the ones taken from ... [native-inputs]: ... here, by adding automake.master
parent
1a1bce6b5d
commit
f8dae88c1e
|
@ -20,6 +20,7 @@
|
||||||
;;; Copyright © 2018 Benjamin Slade <slade@jnanam.net>
|
;;; Copyright © 2018 Benjamin Slade <slade@jnanam.net>
|
||||||
;;; Copyright © 2019 nee <nee@cock.li>
|
;;; Copyright © 2019 nee <nee@cock.li>
|
||||||
;;; Copyright © 2019 Yoshinori Arai <kumagusu08@gmail.com>
|
;;; Copyright © 2019 Yoshinori Arai <kumagusu08@gmail.com>
|
||||||
|
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
|
||||||
;;;
|
;;;
|
||||||
;;; This file is part of GNU Guix.
|
;;; This file is part of GNU Guix.
|
||||||
;;;
|
;;;
|
||||||
|
@ -4742,8 +4743,21 @@ protocol and arbitrary X extension protocol.")
|
||||||
"0c3563kw9fg15dpgx4dwvl12qz6sdqdns1pxa574hc7i5m42mman"))))
|
"0c3563kw9fg15dpgx4dwvl12qz6sdqdns1pxa574hc7i5m42mman"))))
|
||||||
(build-system gnu-build-system)
|
(build-system gnu-build-system)
|
||||||
(arguments
|
(arguments
|
||||||
'(#:phases
|
`(#:phases
|
||||||
(modify-phases %standard-phases
|
(modify-phases %standard-phases
|
||||||
|
(add-after 'unpack 'fix-configure
|
||||||
|
(lambda* (#:key inputs native-inputs #:allow-other-keys)
|
||||||
|
;; Replace outdated config.sub and config.guess:
|
||||||
|
(for-each (lambda (file)
|
||||||
|
(install-file (string-append
|
||||||
|
(assoc-ref
|
||||||
|
(or native-inputs inputs) "automake")
|
||||||
|
"/share/automake-"
|
||||||
|
,(version-major+minor
|
||||||
|
(package-version automake))
|
||||||
|
"/" file) "."))
|
||||||
|
'("config.sub" "config.guess"))
|
||||||
|
#t))
|
||||||
(add-after 'install 'wrap-mkfontdir
|
(add-after 'install 'wrap-mkfontdir
|
||||||
(lambda* (#:key inputs outputs #:allow-other-keys)
|
(lambda* (#:key inputs outputs #:allow-other-keys)
|
||||||
(wrap-program (string-append (assoc-ref outputs "out")
|
(wrap-program (string-append (assoc-ref outputs "out")
|
||||||
|
@ -4755,7 +4769,8 @@ protocol and arbitrary X extension protocol.")
|
||||||
(inputs
|
(inputs
|
||||||
`(("mkfontscale" ,mkfontscale)))
|
`(("mkfontscale" ,mkfontscale)))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("pkg-config" ,pkg-config)))
|
`(("pkg-config" ,pkg-config)
|
||||||
|
("automake" ,automake))) ;For up to date 'config.guess' and 'config.sub'.
|
||||||
(home-page "https://www.x.org/wiki/")
|
(home-page "https://www.x.org/wiki/")
|
||||||
(synopsis "Create an index of X font files in a directory")
|
(synopsis "Create an index of X font files in a directory")
|
||||||
(description
|
(description
|
||||||
|
|
Reference in New Issue