From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ricardo Wurmus Subject: [PATCH] Update and fix Chicken Scheme. Date: Sun, 20 Mar 2016 23:07:51 +0100 Message-ID: <87h9g03irs.fsf@elephly.net> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:49687) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ahlW0-0004VC-T9 for guix-devel@gnu.org; Sun, 20 Mar 2016 18:08:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ahlVx-00016N-BD for guix-devel@gnu.org; Sun, 20 Mar 2016 18:08:04 -0400 Received: from sender163-mail.zoho.com ([74.201.84.163]:24284) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ahlVx-00015x-1K for guix-devel@gnu.org; Sun, 20 Mar 2016 18:08:01 -0400 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+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Hi Guix, with these patches the latest version of Chicken Scheme builds on my machine. I’m not happy about disabling all port tests, but I didn’t manage to fix the problem with the file. I’m getting this error, but the line numbers don’t seem to match, so it’s hard for me to find the culprit: > Error: (line 294) invalid escape-sequence '\x o' ~~ Ricardo --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-chicken-Update-to-4.10.0.patch Content-Transfer-Encoding: 8bit >From e2fc4f5bfac95e51ba0494ffccd6354680a73385 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 20 Mar 2016 17:10:12 +0100 Subject: [PATCH 1/4] gnu: chicken: Update to 4.10.0. * gnu/packages/scheme.scm (chicken): Update to 4.10.0. --- gnu/packages/scheme.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 00b573f..5361f23 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -2,6 +2,7 @@ ;;; Copyright © 2013, 2014, 2015 Ludovic Courtès ;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer ;;; Copyright © 2015 Federico Beffa +;;; Copyright © 2016 Ricardo Wurmus ;;; ;;; This file is part of GNU Guix. ;;; @@ -309,14 +310,14 @@ mashups, office (web agendas, mail clients, ...), etc.") (define-public chicken (package (name "chicken") - (version "4.9.0.1") + (version "4.10.0") (source (origin (method url-fetch) - (uri (string-append "http://code.call-cc.org/releases/4.9.0/chicken-" - version ".tar.gz")) + (uri (string-append "http://code.call-cc.org/releases/" + version "/chicken-" version ".tar.gz")) (sha256 (base32 - "0598mar1qswfd8hva9nqs88zjn02lzkqd8fzdd21dz1nki1prpq4")))) + "16w96jrhb6qf62fgznk53f55yhfv81damghdjn31k5hirnmza1qf")))) (build-system gnu-build-system) (arguments `(#:modules ((guix build gnu-build-system) -- 2.6.3 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0002-gnu-chicken-Use-modify-phases-syntax.patch >From 98fe76c36134f78346b18f62b09cc1ba42d11dde Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 20 Mar 2016 17:10:41 +0100 Subject: [PATCH 2/4] gnu: chicken: Use "modify-phases" syntax. * gnu/packages/scheme.scm (chicken)[arguments]: Use "modify-phases" syntax. --- gnu/packages/scheme.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index 5361f23..cb113e8 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -326,11 +326,12 @@ mashups, office (web agendas, mail clients, ...), etc.") ;; No `configure' script; run "make check" after "make install" as ;; prescribed by README. - #:phases (alist-cons-after - 'install 'check - (assoc-ref %standard-phases 'check) - (fold alist-delete %standard-phases - '(configure check))) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (delete 'check) + (add-after 'install 'check + (assoc-ref %standard-phases 'check))) #:make-flags (let ((out (assoc-ref %outputs "out"))) (list "PLATFORM=linux" -- 2.6.3 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0003-gnu-chicken-Disable-port-tests.patch >From 345d60f91763c5edf696c7e9c27675655423b8e3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 20 Mar 2016 23:01:11 +0100 Subject: [PATCH 3/4] gnu: chicken: Disable port tests. * gnu/packages/scheme.scm (chicken)[arguments]: Do not run port tests. --- gnu/packages/scheme.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index cb113e8..b8b2dba 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -331,7 +331,14 @@ mashups, office (web agendas, mail clients, ...), etc.") (delete 'configure) (delete 'check) (add-after 'install 'check - (assoc-ref %standard-phases 'check))) + (assoc-ref %standard-phases 'check)) + (add-after 'unpack 'disable-broken-tests + (lambda _ + ;; The port tests fail with this error: + ;; Error: (line 294) invalid escape-sequence '\x o' + (substitute* "tests/runtests.sh" + (("\\$interpret -s port-tests\\.scm") "")) + #t))) #:make-flags (let ((out (assoc-ref %outputs "out"))) (list "PLATFORM=linux" -- 2.6.3 --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=0004-gnu-chicken-Build-with-GCC-4.8.patch >From fd4730fc5cf431d42d9ae670544eb7d6408d78e3 Mon Sep 17 00:00:00 2001 From: Ricardo Wurmus Date: Sun, 20 Mar 2016 23:03:24 +0100 Subject: [PATCH 4/4] gnu: chicken: Build with GCC 4.8. * gnu/packages/scheme.scm (chicken)[native-inputs]: Add GCC 4.8. --- gnu/packages/scheme.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/scheme.scm b/gnu/packages/scheme.scm index b8b2dba..f166293 100644 --- a/gnu/packages/scheme.scm +++ b/gnu/packages/scheme.scm @@ -36,6 +36,7 @@ #:use-module (gnu packages pkg-config) #:use-module (gnu packages avahi) #:use-module (gnu packages libphidget) + #:use-module (gnu packages gcc) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages libffi) @@ -347,6 +348,12 @@ mashups, office (web agendas, mail clients, ...), etc.") ;; Parallel builds are not supported, as noted in README. #:parallel-build? #f)) + ;; One of the tests ("testing direct invocation can detect calls of too + ;; many arguments...") times out when building with a more recent GCC. + ;; The problem was reported here: + ;; https://lists.gnu.org/archive/html/chicken-hackers/2015-04/msg00059.html + (native-inputs + `(("gcc" ,gcc-4.8))) (home-page "http://www.call-cc.org/") (synopsis "R5RS Scheme implementation that compiles native code via C") (description -- 2.6.3 --=-=-=--