[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
21/35: gnu: texinfo-4: Fix cross compilation
From: |
guix-commits |
Subject: |
21/35: gnu: texinfo-4: Fix cross compilation |
Date: |
Thu, 10 Oct 2019 11:33:19 -0400 (EDT) |
mothacehe pushed a commit to branch core-updates
in repository guix.
commit 6fe3e25006308ebd570996d444475a6a30d4d30e
Author: Pierre-Moana Levesque <address@hidden>
Date: Thu Jul 4 19:21:37 2019 +0200
gnu: texinfo-4: Fix cross compilation
* gnu/packages/texinfo.scm (texinfo-4)[native-inputs]: Add automake and
native-inputs from texinfo package,
[arguments]: Replace outdated config.sub and config.guess by the ones
taken from automake above. Also make sure native tools are built before
build
phase.
---
gnu/packages/texinfo.scm | 35 +++++++++++++++++++++++++++++++++--
1 file changed, 33 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm
index a79330d..1603db0 100644
--- a/gnu/packages/texinfo.scm
+++ b/gnu/packages/texinfo.scm
@@ -21,9 +21,11 @@
;;; along with GNU Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (gnu packages texinfo)
+ #:use-module (gnu packages autotools)
#:use-module (guix licenses)
#:use-module (guix packages)
#:use-module (guix download)
+ #:use-module (guix utils)
#:use-module (guix build-system gnu)
#:use-module (gnu packages)
#:use-module (gnu packages compression)
@@ -106,8 +108,37 @@ is on expressing the content semantically, avoiding
physical markup commands.")
(sha256
(base32
"1rf9ckpqwixj65bw469i634897xwlgkm5i9g2hv3avl6mv7b0a3d"))))
- (native-inputs '())
- (inputs `(("ncurses" ,ncurses) ("xz" ,xz)))))
+ (inputs `(("ncurses" ,ncurses)
+ ("xz" ,xz)))
+ (native-inputs
+ `(("automake" ,automake)
+ ,@(package-native-inputs texinfo)))
+ (arguments
+ (substitute-keyword-arguments (package-arguments texinfo)
+ ((#:phases phases)
+ `(modify-phases ,phases
+ (add-after 'unpack 'fix-configure
+ (lambda* (#:key inputs native-inputs #:allow-other-keys)
+ ;; Replace outdated config.sub and config.guess.
+ (with-directory-excursion "build-aux"
+ (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))
+ ;; Build native version of tools before running 'build phase.
+ ,@(if (%current-target-system)
+ `((add-before 'build 'make-native-gnu-lib
+ (lambda* (#:key inputs #:allow-other-keys)
+ (invoke "make" "-C" "tools/gnulib/lib")
+ #t)))
+ '())))))))
(define-public info-reader
;; The idea of this package is to have the standalone Info reader without
- 11/35: gnu: ath9k-htc-firmware: Fix cross compilation., (continued)
- 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, 2019/10/10
- 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 <=
- 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
- 23/35: gnu: libgpg-error: Fix cross compilation., guix-commits, 2019/10/10
- 31/35: gnu: console-setup: Fix cross-compilation., guix-commits, 2019/10/10
- 33/35: gnu: bc: Fix cross-compilation., guix-commits, 2019/10/10
- 35/35: Merge branch 'master' into core-updates, guix-commits, 2019/10/10