[gentoo-commits] proj/lisp:master commit in: dev-lisp/clozurecl/files/, dev-lisp/clozurecl/

2018-05-02 Thread José María Alonso
commit: c0d6f4fc3b771c5aec12062061ede1f429b494b0
Author: Chema Alonso Josa  gentoo  org>
AuthorDate: Wed May  2 19:11:49 2018 +
Commit: José María Alonso  gentoo  org>
CommitDate: Wed May  2 19:11:49 2018 +
URL:https://gitweb.gentoo.org/proj/lisp.git/commit/?id=c0d6f4fc

dev-lisp/clozurecl: Drops uneeded patch

 dev-lisp/clozurecl/clozurecl-1.11.5.ebuild |  2 +-
 dev-lisp/clozurecl/files/ccl-1.11-glibc-2.26.patch | 41 --
 2 files changed, 1 insertion(+), 42 deletions(-)

diff --git a/dev-lisp/clozurecl/clozurecl-1.11.5.ebuild 
b/dev-lisp/clozurecl/clozurecl-1.11.5.ebuild
index 7eeebd9c..63a93582 100644
--- a/dev-lisp/clozurecl/clozurecl-1.11.5.ebuild
+++ b/dev-lisp/clozurecl/clozurecl-1.11.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6

diff --git a/dev-lisp/clozurecl/files/ccl-1.11-glibc-2.26.patch 
b/dev-lisp/clozurecl/files/ccl-1.11-glibc-2.26.patch
deleted file mode 100644
index 3a9bdf64..
--- a/dev-lisp/clozurecl/files/ccl-1.11-glibc-2.26.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -U2 -r ccl.orig/lisp-kernel/platform-linuxx8632.h 
ccl/lisp-kernel/platform-linuxx8632.h
 ccl.orig/lisp-kernel/platform-linuxx8632.h 2015-11-07 02:10:11.0 
+0600
-+++ ccl/lisp-kernel/platform-linuxx8632.h  2017-11-21 23:50:31.630113003 
+0700
-@@ -21,5 +21,7 @@
- #define PLATFORM_WORD_SIZE PLATFORM_WORD_SIZE_32
- 
--typedef struct ucontext ExceptionInformation;
-+#include 
-+
-+typedef ucontext_t ExceptionInformation;
- 
- #define MAXIMUM_MAPPABLE_MEMORY (9U<<28)
-diff -U2 -r ccl.orig/lisp-kernel/platform-linuxx8664.h 
ccl/lisp-kernel/platform-linuxx8664.h
 ccl.orig/lisp-kernel/platform-linuxx8664.h 2015-11-07 02:10:11.0 
+0600
-+++ ccl/lisp-kernel/platform-linuxx8664.h  2017-11-21 23:51:44.693114350 
+0700
-@@ -21,5 +21,7 @@
- #define PLATFORM_WORD_SIZE PLATFORM_WORD_SIZE_64
- 
--typedef struct ucontext ExceptionInformation;
-+#include 
-+
-+typedef ucontext_t ExceptionInformation;
- 
- #define MAXIMUM_MAPPABLE_MEMORY (512L<<30L)
-diff -U2 -r ccl.orig/lisp-kernel/x86-exceptions.c 
ccl/lisp-kernel/x86-exceptions.c
 ccl.orig/lisp-kernel/x86-exceptions.c  2015-11-07 02:10:11.0 
+0600
-+++ ccl/lisp-kernel/x86-exceptions.c   2017-11-21 23:55:00.816117965 +0700
-@@ -1678,5 +1678,5 @@
-   void  *puc;
-   siginfo_t info;
--  struct ucontext uc;
-+  ucontext_t uc;
-   struct _fpstate fpstate;
-   char retcode[8];
-@@ -2426,5 +2426,5 @@
-  change copy_ucontext().
-   */
--  stack.ss_size -= sizeof(struct ucontext);
-+  stack.ss_size -= sizeof(ucontext_t);
- #endif
-   if (sigaltstack(, NULL) != 0) {



[gentoo-commits] proj/lisp:master commit in: dev-lisp/clozurecl/files/, dev-lisp/clozurecl/

2017-05-22 Thread José María Alonso
commit: d6742bf1637a6d668a7639bc800af813038b5537
Author: Chema Alonso Josa  gentoo  org>
AuthorDate: Mon May 22 19:52:08 2017 +
Commit: José María Alonso  gentoo  org>
CommitDate: Mon May 22 19:52:08 2017 +
URL:https://gitweb.gentoo.org/proj/lisp.git/commit/?id=d6742bf1

dev-lisp/clozurecl: Syncs with gentoo repository

 dev-lisp/clozurecl/clozurecl-1.11-r1.ebuild |   2 +-
 dev-lisp/clozurecl/files/ccl-format.patch   | 128 
 2 files changed, 129 insertions(+), 1 deletion(-)

diff --git a/dev-lisp/clozurecl/clozurecl-1.11-r1.ebuild 
b/dev-lisp/clozurecl/clozurecl-1.11-r1.ebuild
index 204cefed..c5f9a551 100644
--- a/dev-lisp/clozurecl/clozurecl-1.11-r1.ebuild
+++ b/dev-lisp/clozurecl/clozurecl-1.11-r1.ebuild
@@ -28,7 +28,6 @@ DEPEND="${RDEPEND}
!dev-lisp/openmcl"
 
 S="${WORKDIR}"/${MY_PN}
-PATCHES=( "${FILESDIR}"/ccl-format.patch )
 ENVD="${T}"/50ccl
 
 src_configure() {
@@ -45,6 +44,7 @@ src_configure() {
 
 src_prepare() {
default
+   epatch "${FILESDIR}"/ccl-format.patch
cp /usr/share/common-lisp/source/asdf/build/asdf.lisp tools/ || die
 }
 

diff --git a/dev-lisp/clozurecl/files/ccl-format.patch 
b/dev-lisp/clozurecl/files/ccl-format.patch
new file mode 100644
index ..c2df37c2
--- /dev/null
+++ b/dev-lisp/clozurecl/files/ccl-format.patch
@@ -0,0 +1,128 @@
+diff -r -U1 ccl.orig/lib/format.lisp ccl/lib/format.lisp
+--- ccl.orig/lib/format.lisp   2015-11-07 02:10:10.0 +0600
 ccl/lib/format.lisp2015-11-20 22:51:51.736191995 +0600
+@@ -1296,5 +1296,2 @@
+   
+-
+-
+-
+ ;;; Given a non-negative floating point number, SCALE-EXPONENT returns a
+@@ -1305,41 +1302,74 @@
+ 
+-
+-(defconstant long-log10-of-2 0.30103d0)
+-
+-#| 
+-(defun scale-exponent (x)
+-  (if (floatp x )
+-  (scale-expt-aux (abs x) 0.0d0 1.0d0 1.0d1 1.0d-1 long-log10-of-2)
+-  (report-bad-arg x 'float)))
+-
+-#|this is the slisp code that was in the place of the error call above.
+-  before floatp was put in place of shortfloatp.
+-  ;(scale-expt-aux x (%sp-l-float 0) (%sp-l-float 1) %long-float-ten
+-  ;%long-float-one-tenth long-log10-of-2)))
+-|#
+-
+-; this dies with floating point overflow (?) if fed 
least-positive-double-float
+-
+-(defun scale-expt-aux (x zero one ten one-tenth log10-of-2)
+-  (let ((exponent (nth-value 1 (decode-float x
+-(if (= x zero)
+-  (values zero 1)
+-  (let* ((e (round (* exponent log10-of-2)))
+- (x (if (minusp e);For the end ranges.
+-  (* x ten (expt ten (- -1 e)))
+-  (/ x ten (expt ten (1- e))
+-(do ((d ten (* d ten))
+- (y x (/ x d))
+- (e e (1+ e)))
+-((< y one)
+- (do ((m ten (* m ten))
+-  (z y (* z m))
+-  (e e (1- e)))
+- ((>= z one-tenth) (values x e)
+-|#
+-
+-(defun scale-exponent (n)
+-  (let ((exp (nth-value 1 (decode-float n
+-(values (round (* exp long-log10-of-2)
+-
++(defconstant single-float-min-e
++  (nth-value 1 (decode-float least-positive-single-float)))
++(defconstant double-float-min-e
++  (nth-value 1 (decode-float least-positive-double-float)))
++
++;;; Adapted from CMUCL.
++
++;; This is a modified version of the scale computation from Burger and
++;; Dybvig's paper "Printing floating-point quickly and accurately."
++;; We only want the exponent, so most things not needed for the
++;; computation of the exponent have been removed.  We also implemented
++;; the floating-point log approximation given in Burger and Dybvig.
++;; This is very noticeably faster for large and small numbers.  It is
++;; slower for intermediate sized numbers.
++(defun accurate-scale-exponent (v)
++  (declare (type float v))
++  (if (zerop v)
++  1
++  (let ((float-radix 2)   ; b
++  (float-digits (float-digits v)) ; p
++  (min-e
++   (etypecase v
++ (single-float single-float-min-e)
++ (double-float double-float-min-e
++  (multiple-value-bind (f e)
++  (integer-decode-float v)
++(let ( ;; FIXME: these even tests assume normal IEEE rounding
++  ;; mode.  I wonder if we should cater for non-normal?
++  (high-ok (evenp f)))
++  ;; We only want the exponent here.
++  (labels ((flog (x)
++ (declare (type (float (0.0)) x))
++ (let ((xd (etypecase x
++ (single-float
++  (float x 1d0))
++ (double-float
++  x
++   (ceiling (- (the (double-float -400d0 400d0)
++(log xd 10d0))
++   1d-10
++   (fixup (r s m+ k)
++ (if (if high-ok
++