From patchwork Sun Jul 24 14:10:52 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Patterson X-Patchwork-Id: 13958 Received: (qmail 63590 invoked by uid 89); 24 Jul 2016 14:45:36 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.99.1 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.2 required=5.0 tests=BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 spammy=D*ca, iso88591, iso-8859-1, H*r:sk:mailser X-Spam-Status: No, score=-3.2 required=5.0 tests=BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on sourceware.org X-Spam-Level: X-HELO: lists.gnu.org Received: from lists.gnu.org (HELO lists.gnu.org) (208.118.235.17) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Sun, 24 Jul 2016 14:45:26 +0000 Received: from localhost ([::1]:56258 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bRKeh-0005xW-MY for patchwork@sourceware.org; Sun, 24 Jul 2016 10:45:23 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34781) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bRKec-0005xN-5Y for guix-devel@gnu.org; Sun, 24 Jul 2016 10:45:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bRKeY-0004QT-Gj for guix-devel@gnu.org; Sun, 24 Jul 2016 10:45:17 -0400 Received: from mailservices.uwaterloo.ca ([129.97.128.141]:42430 helo=mailchk-m01.uwaterloo.ca) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bRKeY-0004N8-AW for guix-devel@gnu.org; Sun, 24 Jul 2016 10:45:14 -0400 Received: from localhost ([206.174.179.37]) (authenticated bits=0) by mailchk-m01.uwaterloo.ca (8.14.4/8.14.4) with ESMTP id u6OEAqkN027390 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=NO) for ; Sun, 24 Jul 2016 10:10:56 -0400 Date: Sun, 24 Jul 2016 10:10:52 -0400 From: Andy Patterson To: guix-devel@gnu.org Subject: [PATCH] gnu: sbcl: Update to 1.3.7. Message-ID: <20160724101052.13f6de2c@uwaterloo.ca> X-Mailer: Claws Mail 3.13.2 (GTK+ 2.24.30; x86_64-unknown-linux-gnu) MIME-Version: 1.0 X-UUID: 17728ff5-1b8d-4e23-9896-19cde4d683c5 X-Miltered: at mailchk-m01 with ID 5794CC6C.003 by Joe's j-chkmail (http://j-chkmail.ensmp.fr)! X-Virus-Scanned: clamav-milter 0.99.1 at mailchk-m01 X-Virus-Status: Clean X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.5.9 (mailchk-m01.uwaterloo.ca [129.97.128.141]); Sun, 24 Jul 2016 10:10:56 -0400 (EDT) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 129.97.128.141 X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+patchwork=sourceware.org@gnu.org Sender: "Guix-devel" This patch allows sbcl to build using the newer texlive. Thanks, --- Andy From 33128a233285354aaf3d699e4360ce262b6350e5 Mon Sep 17 00:00:00 2001 From: Andy Patterson 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