[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
27/35: gnu: mkfontdir: Fix aarch64 cross-compilation.
From: |
guix-commits |
Subject: |
27/35: gnu: mkfontdir: Fix aarch64 cross-compilation. |
Date: |
Thu, 10 Oct 2019 11:33:20 -0400 (EDT) |
mothacehe pushed a commit to branch core-updates
in repository guix.
commit f8dae88c1e5808394aca8a45a7433d60ee1b71bb
Author: Mathieu Othacehe <address@hidden>
Date: Fri Jul 5 18:34:09 2019 +0200
gnu: mkfontdir: 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/xorg.scm (mkfontdir)[arguments]: Replace outdated config.sub
and
config.guess, by the ones taken from ...
[native-inputs]: ... here, by adding automake.
---
gnu/packages/xorg.scm | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index d7cd585..d5d983a 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -20,6 +20,7 @@
;;; Copyright © 2018 Benjamin Slade <address@hidden>
;;; Copyright © 2019 nee <address@hidden>
;;; Copyright © 2019 Yoshinori Arai <address@hidden>
+;;; Copyright © 2019 Mathieu Othacehe <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -4742,8 +4743,21 @@ protocol and arbitrary X extension protocol.")
"0c3563kw9fg15dpgx4dwvl12qz6sdqdns1pxa574hc7i5m42mman"))))
(build-system gnu-build-system)
(arguments
- '(#:phases
+ `(#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'fix-configure
+ (lambda* (#:key inputs native-inputs #:allow-other-keys)
+ ;; Replace outdated config.sub and config.guess:
+ (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))
(add-after 'install 'wrap-mkfontdir
(lambda* (#:key inputs outputs #:allow-other-keys)
(wrap-program (string-append (assoc-ref outputs "out")
@@ -4755,7 +4769,8 @@ protocol and arbitrary X extension protocol.")
(inputs
`(("mkfontscale" ,mkfontscale)))
(native-inputs
- `(("pkg-config" ,pkg-config)))
+ `(("pkg-config" ,pkg-config)
+ ("automake" ,automake))) ;For up to date 'config.guess' and
'config.sub'.
(home-page "https://www.x.org/wiki/")
(synopsis "Create an index of X font files in a directory")
(description
- 29/35: gnu: nghttp2: Fix cross-compilation., (continued)
- 29/35: gnu: nghttp2: Fix cross-compilation., guix-commits, 2019/10/10
- 09/35: gnu: http-parser: Fix cross-compilation., guix-commits, 2019/10/10
- 03/35: gnu: python: Fix cross compilation., guix-commits, 2019/10/10
- 10/35: gnu: libgit2: Fix cross compilation., guix-commits, 2019/10/10
- 17/35: gnu: pkg-config: Fix cross-compilation., guix-commits, 2019/10/10
- 11/35: gnu: ath9k-htc-firmware: Fix cross compilation., guix-commits, 2019/10/10
- 19/35: gnu: texinfo: Fix cross-compilation., guix-commits, 2019/10/10
- 15/35: gnu: libarchive: Fix cross-compilation., guix-commits, 2019/10/10
- 32/35: gnu: mdadm: Fix cross-compilation., guix-commits, 2019/10/10
- 28/35: gnu: lvm2: Fix cross-compilation., guix-commits, 2019/10/10
- 27/35: gnu: mkfontdir: Fix aarch64 cross-compilation.,
guix-commits <=
- 26/35: gnu: libsamplerate: Fix aarch64 cross-compilation., guix-commits, 2019/10/10
- 12/35: gnu: mit-krb5: Fix cross-compilation., guix-commits, 2019/10/10
- 13/35: gnu: help2man: Fix cross-compilation., guix-commits, 2019/10/10
- 25/35: gnu: indent: Fix aarch64 cross-compilation., guix-commits, 2019/10/10
- 21/35: gnu: texinfo-4: Fix cross compilation, guix-commits, 2019/10/10
- 18/35: gnu: alsa-utils: Fix cross-compilation., guix-commits, 2019/10/10
- 20/35: gnu: texinfo-5: Fix cross-compilation., guix-commits, 2019/10/10
- 14/35: gnu: xmlto: Fix cross-compilation., guix-commits, 2019/10/10
- 22/35: gnu: guile-xcb: Fix cross-compilation., guix-commits, 2019/10/10
- 24/35: gnu: libpaper: Fix aarch64 cross-compilation., guix-commits, 2019/10/10