Patchwork gnu: sbcl: Update to 1.3.7.

login
register
mail settings
Submitter Andy Patterson
Date July 24, 2016, 2:10 p.m.
Message ID <20160724101052.13f6de2c@uwaterloo.ca>
Download mbox | patch
Permalink /patch/13958/
State New
Headers show

Comments

Andy Patterson - July 24, 2016, 2:10 p.m.
This patch allows sbcl to build using the newer texlive.

Thanks,

--
Andy
=?utf-8?B?5a6L5paH5q2m?= - July 25, 2016, 11:50 a.m.
Andy Patterson <ajpatter@uwaterloo.ca> writes:

> This patch allows sbcl to build using the newer texlive.

Pushed, thanks!

Patch

From 33128a233285354aaf3d699e4360ce262b6350e5 Mon Sep 17 00:00:00 2001
From: Andy Patterson <ajpatter@uwaterloo.ca>
Date: Sun, 24 Jul 2016 09:29:28 -0400
Subject: [PATCH] gnu: sbcl: Update to 1.3.7.

* gnu/packages/lisp.scm (sbcl): Update to 1.3.7.
[arguments]: During the patch-unix-tool-paths phase, avoid running
substitute* on a utf-16-be encoded file.
---
 gnu/packages/lisp.scm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 22f542c..863ee00 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -209,14 +209,14 @@  an interpreter, a compiler, a debugger, and much more.")
 (define-public sbcl
   (package
     (name "sbcl")
-    (version "1.2.8")
+    (version "1.3.7")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "mirror://sourceforge/sbcl/sbcl/" version "/sbcl-"
                            version "-source.tar.bz2"))
        (sha256
-        (base32 "0ab9lw056yf6y0rjmx3iirn5n59pmssqxf00fbmpyl6qsnpaja1d"))))
+        (base32 "0fjdqnb2rsm2vi9794ywp27jr239ddvzc4xfr0dk49jd4v7p2kc5"))))
     (build-system gnu-build-system)
     (outputs '("out" "doc"))
     ;; Bootstrap with CLISP.
@@ -243,7 +243,11 @@  an interpreter, a compiler, a debugger, and much more.")
                ;; occurs in some .sh files too (which contain Lisp code).  Use
                ;; ISO-8859-1 because some of the files are ISO-8859-1 encoded.
                (with-fluids ((%default-port-encoding #f))
-                 (substitute* (find-files "." "\\.(lisp|sh)$")
+                 ;; The removed file is utf-16-be encoded, which gives substitute*
+                 ;; trouble. It does not contain references to the listed programs.
+                 (substitute* (delete
+                               "./tests/data/compile-file-pos-utf16be.lisp"
+                               (find-files "." "\\.(lisp|sh)$"))
                    (("\"/bin/sh\"") (quoted-path bash "/bin/sh"))
                    (("\"/usr/bin/env\"") (quoted-path coreutils "/usr/bin/env"))
                    (("\"/bin/cat\"") (quoted-path coreutils "/bin/cat"))
-- 
2.9.1