[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
15/61: gnu: libpaper: Fix aarch64 cross-compilation.
From: |
guix-commits |
Subject: |
15/61: gnu: libpaper: Fix aarch64 cross-compilation. |
Date: |
Wed, 21 Aug 2019 04:24:50 -0400 (EDT) |
mothacehe pushed a commit to branch wip-cross-system
in repository guix.
commit cc81254fdff1d3be5fb3695f6fc2907b396f7b22
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 817104c..e6879ea 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.
;;;
@@ -84,6 +85,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 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)))))
(synopsis "Library for handling paper sizes")
(description
"The paper library and accompanying files are intended to provide a simple
- 12/61: gnu: cmake: Fix cross-compilation., (continued)
- 12/61: gnu: cmake: Fix cross-compilation., guix-commits, 2019/08/21
- 10/61: gnu: openssl: Fix cross-compilation., guix-commits, 2019/08/21
- 09/61: gnu: http-parser: Fix cross-compilation., guix-commits, 2019/08/21
- 07/61: gnu: libgpg-error: Fix cross compilation., guix-commits, 2019/08/21
- 14/61: gnu: ath9k-htc-firmware: Fix cross compilation., guix-commits, 2019/08/21
- 08/61: gnu: python: Further cross-compilation fixes., guix-commits, 2019/08/21
- 01/61: gnu: perl: Fix cross-compilation., guix-commits, 2019/08/21
- 03/61: gnu: tcl: Fix cross-compilation., guix-commits, 2019/08/21
- 02/61: gnu: python: Fix cross compilation., guix-commits, 2019/08/21
- 13/61: gnu: libgit2: Fix cross compilation., guix-commits, 2019/08/21
- 15/61: gnu: libpaper: Fix aarch64 cross-compilation.,
guix-commits <=
- 17/61: gnu: texinfo-5: Fix cross-compilation., guix-commits, 2019/08/21
- 22/61: gnu: cyrus-sasl: Fix cross-compilation., guix-commits, 2019/08/21
- 05/61: gnu: libxslt: Fix cross-compilation., guix-commits, 2019/08/21
- 34/61: gnu: lvm2: Fix cross-compilation., guix-commits, 2019/08/21
- 19/61: gnu: indent: Fix aarch64 cross-compilation., guix-commits, 2019/08/21
- 27/61: gnu: pkg-config: Fix cross-compilation., guix-commits, 2019/08/21
- 28/61: gnu: mkfontdir: Fix aarch64 cross-compilation., guix-commits, 2019/08/21
- 31/61: gnu: glibc-utf8-locales: Fix cross-compilation., guix-commits, 2019/08/21
- 40/61: gnu: procps: Fix cross-compilation., guix-commits, 2019/08/21
- 39/61: gnu: make-linux-libre: Fix cross-compilation., guix-commits, 2019/08/21