gnu: indent: 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/code.scm (indent)[arguments]: Replace outdated config.sub and config.guess, taken from ... [native-inputs]: ... here, by adding automake. (indent-2.2.12)[native-inputs]: Inherit from indent native-inputs to keep automake that is added above.master
parent
3fe8fe5360
commit
59bd4b90e8
|
@ -29,6 +29,7 @@
|
||||||
|
|
||||||
(define-module (gnu packages code)
|
(define-module (gnu packages code)
|
||||||
#:use-module (guix packages)
|
#:use-module (guix packages)
|
||||||
|
#:use-module (guix utils)
|
||||||
#:use-module (guix download)
|
#:use-module (guix download)
|
||||||
#:use-module (guix git-download)
|
#:use-module (guix git-download)
|
||||||
#:use-module ((guix licenses) #:prefix license:)
|
#:use-module ((guix licenses) #:prefix license:)
|
||||||
|
@ -644,9 +645,24 @@ the C, C++, C++/CLI, Objective‑C, C#, and Java programming languages.")
|
||||||
;; overrides this to be in PREFIX/doc. Fix this.
|
;; overrides this to be in PREFIX/doc. Fix this.
|
||||||
(substitute* "doc/Makefile.in"
|
(substitute* "doc/Makefile.in"
|
||||||
(("^docdir = .*$") "docdir = @docdir@\n"))
|
(("^docdir = .*$") "docdir = @docdir@\n"))
|
||||||
|
#t))
|
||||||
|
(add-after 'unpack 'fix-configure
|
||||||
|
(lambda* (#:key inputs native-inputs #:allow-other-keys)
|
||||||
|
;; Replace outdated config.sub and config.guess:
|
||||||
|
(with-directory-excursion "config"
|
||||||
|
(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)))))
|
#t)))))
|
||||||
(native-inputs
|
(native-inputs
|
||||||
`(("texinfo" ,texinfo)))
|
`(("texinfo" ,texinfo)
|
||||||
|
("automake" ,automake))) ; For up to date 'config.guess' and 'config.sub'.
|
||||||
(synopsis "Code reformatter")
|
(synopsis "Code reformatter")
|
||||||
(description
|
(description
|
||||||
"Indent is a program that makes source code easier to read by
|
"Indent is a program that makes source code easier to read by
|
||||||
|
|
Reference in New Issue