[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/03: gnu: sed: Do not attempt to rebuild 'doc/sed.1'.
From: |
Ludovic Courtès |
Subject: |
02/03: gnu: sed: Do not attempt to rebuild 'doc/sed.1'. |
Date: |
Sun, 22 Jan 2017 12:13:55 +0000 (UTC) |
civodul pushed a commit to branch core-updates
in repository guix.
commit c8b44fc10717a106b305d66e95ea27d1a3be45f5
Author: Ludovic Courtès <address@hidden>
Date: Sun Jan 22 13:10:56 2017 +0100
gnu: sed: Do not attempt to rebuild 'doc/sed.1'.
* gnu/packages/base.scm (sed)[arguments]: Add 'dont-rebuild-sed.1'
phase.
[native-inputs]: Remove.
---
gnu/packages/base.scm | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/base.scm b/gnu/packages/base.scm
index dc6ce4f..f6946f3 100644
--- a/gnu/packages/base.scm
+++ b/gnu/packages/base.scm
@@ -131,6 +131,15 @@ including, for example, recursive directory searching.")
(arguments
`(#:phases
(modify-phases %standard-phases
+ (add-after 'unpack 'dont-rebuild-sed.1
+ (lambda _
+ ;; Make sure we do not attempt to rebuild 'doc/sed.1', which does
+ ;; not work when cross-compiling because we cannot run 'sed'.
+ ;; This is fixed upstream as commit a0a25e3.
+ (substitute* "Makefile.in"
+ (("^doc/sed\\.1:.*")
+ "doc/sed.1:\n"))
+ #t))
(add-before 'patch-source-shebangs 'patch-test-suite
(lambda* (#:key inputs #:allow-other-keys)
(patch-makefile-SHELL "testsuite/Makefile.tests")
@@ -139,8 +148,6 @@ including, for example, recursive directory searching.")
(("/bin/sh")
(which "sh")))
#t)))))
- (native-inputs
- `(("perl" ,perl))) ; for build-aux/help2man
(description
"Sed is a non-interactive, text stream editor. It receives a text
input from a file or from standard input and it then applies a series of text