[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
15/19: gnu: libpaper: Fix aarch64 cross-compilation.
From: |
guix-commits |
Subject: |
15/19: gnu: libpaper: Fix aarch64 cross-compilation. |
Date: |
Wed, 3 Jul 2019 10:47:23 -0400 (EDT) |
mothacehe pushed a commit to branch wip-cross-system
in repository guix.
commit 944444fcf2d1cacd15722996f5648bad17051d38
Author: Mathieu Othacehe <address@hidden>
Date: Tue Jul 2 16:20:19 2019 +0200
gnu: libpaper: 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/ghostscript.scm (libpaper)[arguments]: Replace outdated
config.sub and
config.guess, taken from ...
[native-inputs]: ... here, by adding automake.
---
gnu/packages/ghostscript.scm | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff --git a/gnu/packages/ghostscript.scm b/gnu/packages/ghostscript.scm
index 53a9b60..232eca3 100644
--- a/gnu/packages/ghostscript.scm
+++ b/gnu/packages/ghostscript.scm
@@ -8,6 +8,7 @@
;;; Copyright © 2017 Leo Famulari <address@hidden>
;;; Copyright © 2018 Tobias Geerinckx-Rice <address@hidden>
;;; Copyright © 2018 Marius Bakke <address@hidden>
+;;; Copyright © 2019 Mathieu Othacehe <address@hidden>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -91,6 +92,24 @@ Consortium standard (ICC), approved as ISO 15076-1.")
(sha256 (base32
"0zhcx67afb6b5r936w5jmaydj3ks8zh83n9rm5sv3m3k8q8jib1q"))))
(build-system gnu-build-system)
+ (native-inputs
+ `(("automake" ,automake))) ; For up to date 'config.guess' and
'config.sub'.
+ (arguments
+ `(#:phases
+ (modify-phases %standard-phases
+ (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 "Library for handling paper sizes")
(description
"The paper library and accompanying files are intended to provide a simple
- branch wip-cross-system created (now a4afeb1), guix-commits, 2019/07/03
- 13/19: gnu: libgit2: Fix cross compilation., guix-commits, 2019/07/03
- 02/19: gnu: python: Fix cross compilation., guix-commits, 2019/07/03
- 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 <=
- 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, 2019/07/03
- 01/19: gnu: perl: Fix cross-compilation., guix-commits, 2019/07/03