Re: [PATCH] gnu: Add CCL.

2015-02-23 Thread Ludovic Courtès
taylanbayi...@gmail.com (Taylan Ulrich Bayırlı/Kammer) skribis:

 This uses a precompiled lisp heap image, which cannot be generated
 without already having another version of itself (not even another CL
 implementation), so it's perfect breeding ground for a Thompson
 hack. :-)

 I've been told to wait for Ludovic's input on whether the package is
 acceptable, due to the heap image issue, so postpone reviewing it if you
 want.

I think this is an unfortunate but common bootstrapping problem for
compilers (MIT/GNU Scheme, GCJ/ECJ/IcedTea, GHC, etc.) and there’s not
much we can do about it when the upstream maintainers don’t provide a
way to bootstrap from source.  So I think that’s not great, but that’s
acceptable.

[...]

 + (match (%current-system)
 +   ((or i686-linux x86_64-linux)
 +0mr653q5px05lr11z2mk551m5g47b4wq96vbfibpp0qlc9jp58lc)
 +   (armhf
 +
 1py02irpmi2qz5rq3h33wfv6impf15z8i2rign6hvhlqn7s99wwh

Please add a ‘supported-systems’ field that lists those 3 systems.

OK to push with this change.

 +(license (list license:lgpl2.1
 +   license:clarified-artistic ;TRIVIAL-LDAP package

TRIVIAL-LDAP?

Thanks!

Ludo’.



Re: [PATCH] gnu: Add CCL.

2015-02-23 Thread Taylan Ulrich Bayırlı/Kammer
l...@gnu.org (Ludovic Courtès) writes:

 +(license (list license:lgpl2.1
 +   license:clarified-artistic ;TRIVIAL-LDAP package

 TRIVIAL-LDAP?

Just the name of some CL package.

Thanks for the review; pushed with the change you requested.

Taylan



[PATCH] gnu: Add CCL.

2015-02-15 Thread Taylan Ulrich Bayırlı/Kammer
This uses a precompiled lisp heap image, which cannot be generated
without already having another version of itself (not even another CL
implementation), so it's perfect breeding ground for a Thompson
hack. :-)

I've been told to wait for Ludovic's input on whether the package is
acceptable, due to the heap image issue, so postpone reviewing it if you
want.

Also, I assume there's no need to regenerate the heap image, unlike the
lisp kernel which is a C program and therefore needs to be compiled by
us to have its rpath and such fixed.

From bf6f00133ab1b18ecd07d6f217376fb1ca1b3bd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Taylan=20Ulrich=20Bay=C4=B1rl=C4=B1/Kammer?=
 taylanbayi...@gmail.com
Date: Mon, 16 Feb 2015 00:46:12 +0100
Subject: [PATCH] gnu: Add CCL.

* gnu/packages/lisp.scm (ccl): New variable.
---
 gnu/packages/lisp.scm | 108 +-
 1 file changed, 107 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index fe9cdab..de6a170 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -36,7 +36,10 @@
   #:use-module (gnu packages readline)
   #:use-module (gnu packages libsigsegv)
   #:use-module (gnu packages admin)
-  #:use-module (gnu packages ed))
+  #:use-module (gnu packages ed)
+  #:use-module (gnu packages m4)
+  #:use-module (gnu packages version-control)
+  #:use-module (ice-9 match))
 
 (define-public gcl
   (package
@@ -278,3 +281,106 @@ statistical profiler, a code coverage tool, and many other extensions.)
 ;; loop macro has its own license.  See COPYING file for further notes.
 (license (list license:public-domain license:bsd-2
(license:x11-style file://src/code/loop.lisp)
+
+(define-public ccl
+  (package
+(name ccl)
+(version 1.10)
+(source #f)
+(build-system gnu-build-system)
+;; CCL consists of a lisp kernel and heap image, both of which are
+;; shipped in precompiled form in source tarballs.  The former is a C
+;; program which we can rebuild from scratch, but the latter cannot be
+;; generated without an already working copy of CCL, and is platform
+;; dependent, so we need to fetch the correct tarball for the platform.
+(inputs
+ `((ccl
+,(origin
+   (method url-fetch)
+   (uri (string-append
+ ftp://ftp.clozure.com/pub/release/1.10/ccl-; version -
+ (match (%current-system)
+   ((or i686-linux x86_64-linux) linuxx86)
+   (armhf-linux linuxarm))
+ .tar.gz))
+   (sha256
+(base32
+ (match (%current-system)
+   ((or i686-linux x86_64-linux)
+0mr653q5px05lr11z2mk551m5g47b4wq96vbfibpp0qlc9jp58lc)
+   (armhf
+1py02irpmi2qz5rq3h33wfv6impf15z8i2rign6hvhlqn7s99wwh
+(native-inputs
+ `((m4 ,m4)
+   (subversion ,subversion)))
+(arguments
+ `(#:tests? #f  ;no 'check' target
+   #:phases
+   (alist-replace
+'unpack
+(lambda* (#:key inputs #:allow-other-keys)
+  (and (zero? (system* tar xzvf (assoc-ref inputs ccl)))
+   (begin (chdir ccl) #t)))
+(alist-delete
+ 'configure
+ (alist-cons-before
+  'build 'pre-build
+  ;; Enter the source directory for the current platform's lisp
+  ;; kernel, and run 'make clean' to remove the precompiled one.
+  (lambda _
+(chdir (string-append
+lisp-kernel/
+,(match (or (%current-target-system) (%current-system))
+   (i686-linux linuxx8632)
+   (x86_64-linux linuxx8664)
+   (armhf-linux linuxarm
+(substitute* '(Makefile)
+  ((/bin/rm) rm))
+(setenv CC gcc)
+(zero? (system* make clean)))
+  ;; XXX Do we need to recompile the heap image as well for Guix?
+  ;; For now just use the one we already got in the tarball.
+  (alist-replace
+   'install
+   (lambda* (#:key outputs inputs #:allow-other-keys)
+ ;; The lisp kernel built by running 'make' in lisp-kernel/$system
+ ;; is put back into the original directory, so go back.  The heap
+ ;; image is there as well.
+ (chdir ../..)
+ (let* ((out (assoc-ref outputs out))
+(libdir (string-append out /lib/))
+(bindir (string-append out /bin/))
+(wrapper (string-append bindir ccl))
+(bash (assoc-ref inputs bash))
+(kernel
+ ,(match (or (%current-target-system) (%current-system))
+(i686-linux lx86cl)
+(x86_64-linux lx86cl64)
+(armhf-linux armcl)))
+(heap