[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#36477] [PATCH v2 19/61] gnu: indent: Fix aarch64 cross-compilation.
From: |
Mathieu Othacehe |
Subject: |
[bug#36477] [PATCH v2 19/61] gnu: indent: Fix aarch64 cross-compilation. |
Date: |
Wed, 21 Aug 2019 10:54:13 +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 | 18 +++++++++++++++++-
1 file changed, 17 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm
index 13e2c4ad44..50d6870bc7 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:)
@@ -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.
(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)))))
(native-inputs
- `(("texinfo" ,texinfo)))
+ `(("texinfo" ,texinfo)
+ ("automake" ,automake))) ; For up to date 'config.guess' and
'config.sub'.
(synopsis "Code reformatter")
(description
"Indent is a program that makes source code easier to read by
--
2.17.1
- [bug#36477] [PATCH v2 06/61] gnu: xorg: Fix cross-compilation of multiple packages., (continued)
- [bug#36477] [PATCH v2 06/61] gnu: xorg: Fix cross-compilation of multiple packages., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 08/61] gnu: python: Further cross-compilation fixes., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 11/61] gnu: texinfo: Fix cross-compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 09/61] gnu: http-parser: Fix cross-compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 12/61] gnu: cmake: Fix cross-compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 13/61] gnu: libgit2: Fix cross compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 10/61] gnu: openssl: Fix cross-compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 14/61] gnu: ath9k-htc-firmware: Fix cross compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 15/61] gnu: libpaper: Fix aarch64 cross-compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 16/61] gnu: groff: Fix cross compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 19/61] gnu: indent: Fix aarch64 cross-compilation.,
Mathieu Othacehe <=
- [bug#36477] [PATCH v2 21/61] gnu: mit-krb5: Fix cross-compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 17/61] gnu: texinfo-5: Fix cross-compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 22/61] gnu: cyrus-sasl: Fix cross-compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 23/61] gnu: help2man: Fix cross-compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 20/61] gnu: libsamplerate: Fix aarch64 cross-compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 25/61] gnu: libarchive: Fix cross-compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 26/61] gnu: tcsh: Fix cross-compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 27/61] gnu: pkg-config: Fix cross-compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 28/61] gnu: mkfontdir: Fix aarch64 cross-compilation., Mathieu Othacehe, 2019/08/21
- [bug#36477] [PATCH v2 30/61] gnu: icu4c: Fix cross-compilation., Mathieu Othacehe, 2019/08/21