[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: Revert "gnu: texinfo: Fix cross-compilation."
From: |
guix-commits |
Subject: |
01/01: Revert "gnu: texinfo: Fix cross-compilation." |
Date: |
Wed, 4 Sep 2019 13:18:54 -0400 (EDT) |
mbakke pushed a commit to branch master
in repository guix.
commit 4ab97ef18fa9923f00865c2d3f79bead247aa5e3
Author: Marius Bakke <address@hidden>
Date: Wed Sep 4 19:18:10 2019 +0200
Revert "gnu: texinfo: Fix cross-compilation."
This causes too many rebuilds for the master branch.
This reverts commit 210b6412eeb915bba0848c1a947a24bfc51b9efc.
---
gnu/packages/texinfo.scm | 24 ++----------------------
1 file changed, 2 insertions(+), 22 deletions(-)
diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm
index c661dc2..fa98bd5 100644
--- a/gnu/packages/texinfo.scm
+++ b/gnu/packages/texinfo.scm
@@ -42,28 +42,8 @@
(base32
"0qjzvbvnv9003xdrcpi3jp7y68j4hq2ciw9frh2hghh698zlnxvp"))))
(build-system gnu-build-system)
- (arguments
- ;; When cross-compiling, the package is configured twice: once with the
- ;; native compiler and once with the cross-compiler. During the configure
- ;; with the native compiler, the environment is reset. This leads to
- ;; multiple environment variables missing. Do not reset the environment
- ;; to prevent that.
- (if (%current-target-system)
- '(#:phases
- (modify-phases %standard-phases
- (add-before 'configure 'fix-cross-configure
- (lambda _
- (substitute* "configure"
- (("env -i")
- "env "))
- #t))))
- '()))
- (inputs `(("ncurses" ,ncurses)))
- ;; When cross-compiling, texinfo will build some of its own binaries with
- ;; the native compiler. This means ncurses is needed both in both inputs
- ;; and native-inputs.
- (native-inputs `(("perl" ,perl)
- ("ncurses" ,ncurses)))
+ (inputs `(("ncurses" ,ncurses)
+ ("perl" ,perl)))
(native-search-paths
;; This is the variable used by the standalone Info reader.