[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#36477] [PATCH 19/31] gnu: indent: Fix aarch64 cross-compilation.
From: |
Mathieu Othacehe |
Subject: |
[bug#36477] [PATCH 19/31] gnu: indent: Fix aarch64 cross-compilation. |
Date: |
Mon, 8 Jul 2019 11:59:01 +0200 |
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.
---
gnu/packages/code.scm | 21 ++++++++++++++++++++-
1 file changed, 20 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm
index c5dfa4aa7a..22111f7b09 100644
--- a/gnu/packages/code.scm
+++ b/gnu/packages/code.scm
@@ -29,6 +29,7 @@
(define-module (gnu packages code)
#:use-module (guix packages)
+ #:use-module (guix utils)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module ((guix licenses) #:prefix license:)
@@ -634,6 +635,8 @@ the C, C++, C++/CLI, Objective‑C, C#, and Java programming
languages.")
(sha256 (base32
"0f9655vqdvfwbxvs1gpa7py8k1z71aqh8hp73f65vazwbfz436wa"))))
(build-system gnu-build-system)
+ (native-inputs
+ `(("automake" ,automake))) ; For up to date 'config.guess' and
'config.sub'.
(arguments
`(#:phases
(modify-phases %standard-phases
@@ -644,6 +647,20 @@ the C, C++, C++/CLI, Objective‑C, C#, and Java programming
languages.")
;; overrides this to be in PREFIX/doc. Fix this.
(substitute* "doc/Makefile.in"
(("^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)))))
(synopsis "Code reformatter")
(description
@@ -666,7 +683,9 @@ extensions over the standard utility.")
(sha256
(base32
"12xvcd16cwilzglv9h7sgh4h1qqjd1h8s48ji2dla58m4706hzg7"))))
- (native-inputs `(("texinfo" ,texinfo)))))
+ (native-inputs
+ `(("texinfo" ,texinfo)
+ ,@(package-native-inputs indent)))))
(define-public amalgamate
(let* ((commit "c91f07eea1133aa184f652b8f1398eaf03586208")
--
2.17.1
- [bug#36477] [PATCH 07/31] gnu: libgpg-error: Fix cross compilation., (continued)
- [bug#36477] [PATCH 04/31] gnu: tk: Fix cross-compilation., Mathieu Othacehe, 2019/07/08
- [bug#36477] [PATCH 11/31] gnu: texinfo: Fix cross-compilation., Mathieu Othacehe, 2019/07/08
- [bug#36477] [PATCH 08/31] gnu: python: Fix cross-compilation., Mathieu Othacehe, 2019/07/08
- [bug#36477] [PATCH 16/31] gnu: groff: Fix cross compilation., Mathieu Othacehe, 2019/07/08
- [bug#36477] [PATCH 23/31] gnu: help2man: Fix cross-compilation., Mathieu Othacehe, 2019/07/08
- [bug#36477] [PATCH 19/31] gnu: indent: Fix aarch64 cross-compilation.,
Mathieu Othacehe <=
- [bug#36477] [PATCH 13/31] gnu: libgit2: Fix cross compilation., Mathieu Othacehe, 2019/07/08
- [bug#36477] [PATCH 15/31] gnu: libpaper: Fix aarch64 cross-compilation., Mathieu Othacehe, 2019/07/08
[bug#36477] [PATCH 22/31] gnu: cyrus-sasl: Fix cross-compilation., Mathieu Othacehe, 2019/07/08
[bug#36477] [PATCH 24/31] gnu: xmlto: Fix cross-compilation., Mathieu Othacehe, 2019/07/08
[bug#36477] [PATCH 25/31] gnu: libarchive: Fix cross-compilation., Mathieu Othacehe, 2019/07/08