[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
19/19: gnu: indent: Fix aarch64 cross-compilation.
From: |
guix-commits |
Subject: |
19/19: gnu: indent: Fix aarch64 cross-compilation. |
Date: |
Wed, 3 Jul 2019 10:47:24 -0400 (EDT) |
mothacehe pushed a commit to branch wip-cross-system
in repository guix.
commit a4afeb16d907ce196f027759dbd1a5688812197e
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 | 20 +++++++++++++++++++-
1 file changed, 19 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/code.scm b/gnu/packages/code.scm
index c5dfa4a..ede1fa5 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,19 @@ 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 #:allow-other-keys)
+ ;; Replace outdated config.sub and config.guess:
+ (with-directory-excursion "config"
+ (for-each (lambda (file)
+ (install-file
+ (string-append (assoc-ref inputs "automake")
+ "/share/automake-"
+ ,(version-major+minor
+ (package-version automake))
+ "/" file) "."))
+ '("config.sub" "config.guess")))
#t)))))
(synopsis "Code reformatter")
(description
@@ -666,7 +682,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")
- 06/19: gnu: xorg: Fix cross-compilation of multiple packages., (continued)
- 06/19: gnu: xorg: Fix cross-compilation of multiple packages., guix-commits, 2019/07/03
- 15/19: gnu: libpaper: Fix aarch64 cross-compilation., guix-commits, 2019/07/03
- 07/19: gnu: libgpg-error: Fix cross compilation., guix-commits, 2019/07/03
- 10/19: gnu: openssl: Fix cross-compilation., guix-commits, 2019/07/03
- 14/19: gnu: ath9k-htc-firmware: Fix cross compilation., guix-commits, 2019/07/03
- 04/19: gnu: tk: Fix cross-compilation., guix-commits, 2019/07/03
- 03/19: gnu: tcl: Fix cross-compilation., guix-commits, 2019/07/03
- 05/19: gnu: libxslt: Fix cross-compilation., guix-commits, 2019/07/03
- 08/19: gnu: python: Fix cross-compilation., guix-commits, 2019/07/03
- 17/19: gnu: texinfo-5: Fix cross-compilation., guix-commits, 2019/07/03
- 19/19: gnu: indent: Fix aarch64 cross-compilation.,
guix-commits <=
- 01/19: gnu: perl: Fix cross-compilation., guix-commits, 2019/07/03
- 11/19: gnu: texinfo: Fix cross-compilation., guix-commits, 2019/07/03
- 09/19: gnu: http-parser: Fix cross-compilation., guix-commits, 2019/07/03
- 18/19: gnu: bc: Fix cross-compilation., guix-commits, 2019/07/03
- 16/19: gnu: groff: Fix cross compilation., guix-commits, 2019/07/03
- 12/19: gnu: cmake: Extend CMAKE_PREFIX_PATH to non-native inputs., guix-commits, 2019/07/03