[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
19/64: gnu: indent: Fix aarch64 cross-compilation.
From: |
guix-commits |
Subject: |
19/64: gnu: indent: Fix aarch64 cross-compilation. |
Date: |
Fri, 23 Aug 2019 04:10:17 -0400 (EDT) |
mothacehe pushed a commit to branch wip-cross-system
in repository guix.
commit 8d1916e1234a75ab8815f41a4bb0f5822553868a
Author: Mathieu Othacehe <address@hidden>
Date: Wed Jul 3 16:15:39 2019 +0200
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.
---
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 13e2c4a..50d6870 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
- branch wip-cross-system created (now a5d9ed2), guix-commits, 2019/08/23
- 06/64: gnu: xorg: Fix cross-compilation of multiple packages., guix-commits, 2019/08/23
- 04/64: gnu: tk: Fix cross-compilation., guix-commits, 2019/08/23
- 01/64: gnu: perl: Fix cross-compilation., guix-commits, 2019/08/23
- 02/64: gnu: python: Fix cross compilation., guix-commits, 2019/08/23
- 07/64: gnu: libgpg-error: Fix cross compilation., guix-commits, 2019/08/23
- 17/64: gnu: texinfo-5: Fix cross-compilation., guix-commits, 2019/08/23
- 19/64: gnu: indent: Fix aarch64 cross-compilation.,
guix-commits <=
- 26/64: gnu: tcsh: Fix cross-compilation., guix-commits, 2019/08/23
- 20/64: gnu: libsamplerate: Fix aarch64 cross-compilation., guix-commits, 2019/08/23
- 25/64: gnu: libarchive: Fix cross-compilation., guix-commits, 2019/08/23
- 22/64: gnu: cyrus-sasl: Fix cross-compilation., guix-commits, 2019/08/23
- 29/64: gnu: alsa-utils: Fix cross-compilation., guix-commits, 2019/08/23
- 31/64: gnu: glibc-utf8-locales: Fix cross-compilation., guix-commits, 2019/08/23
- 41/64: gnu: procps: Fix cross-compilation., guix-commits, 2019/08/23
- 45/64: gnu: libtool: Fix cross-compilation., guix-commits, 2019/08/23
- 47/64: packages: Set outputs field as thunked., guix-commits, 2019/08/23
- 44/64: gnu: guile-gcrypt: Fix cross-compilation., guix-commits, 2019/08/23