guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: gnu: tcsh: Use ISO-8859-1 when patching "tests/testsuite".


From: Ludovic Courtès
Subject: 01/01: gnu: tcsh: Use ISO-8859-1 when patching "tests/testsuite".
Date: Mon, 02 Mar 2015 22:20:34 +0000

civodul pushed a commit to branch core-updates
in repository guix.

commit e343024dc46a8f513e78eec3d756b0d9f8bfd6f6
Author: Ludovic Courtès <address@hidden>
Date:   Mon Mar 2 23:18:27 2015 +0100

    gnu: tcsh: Use ISO-8859-1 when patching "tests/testsuite".
    
    * gnu/packages/tcsh.scm (tcsh)[arguments]: Set %DEFAULT-PORT-ENCODING
      before substituting "tests/testsuite".  Fixes build failure at
      <http://hydra.gnu.org/build/266962/nixlog/1/raw>.
---
 gnu/packages/tcsh.scm |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/gnu/packages/tcsh.scm b/gnu/packages/tcsh.scm
index f582713..814f2a6 100644
--- a/gnu/packages/tcsh.scm
+++ b/gnu/packages/tcsh.scm
@@ -58,7 +58,11 @@
             (("; other_script.csh") "; /bin/sh other_script.csh"))
           ;; Now, let's generate the test suite and patch it
           (system* "make" "tests/testsuite")
-          (substitute* "tests/testsuite" (("/bin/sh") (which "sh"))))
+
+          ;; This file is ISO-8859-1 encoded.
+          (with-fluids ((%default-port-encoding #f))
+            (substitute* "tests/testsuite"
+              (("/bin/sh") (which "sh")))))
         (alist-cons-after
          'install 'post-install
          (lambda* (#:key inputs outputs #:allow-other-keys)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]