* [gentoo-commits] repo/gentoo:master commit in: dev-lisp/clozurecl/files/, dev-lisp/clozurecl/
@ 2015-11-22 13:37 Ulrich Müller
0 siblings, 0 replies; 5+ messages in thread
From: Ulrich Müller @ 2015-11-22 13:37 UTC (permalink / raw
To: gentoo-commits
commit: 7b3ebbc0eeb0ad18db170c1ffc38dee3da8eff7d
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 22 13:27:45 2015 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 13:37:01 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b3ebbc0
dev-lisp/clozurecl: QA: Revert "fix bug with the ~e format"
Apparently EAPI 6 still breaks infra's metadata generation,
therefore temporarily reverting this.
This reverts commit 80832b5eb0eb27505045760cff5e04230d4f08e2.
dev-lisp/clozurecl/clozurecl-1.11-r1.ebuild | 94 --------------------
dev-lisp/clozurecl/files/ccl-format.patch | 128 ----------------------------
2 files changed, 222 deletions(-)
diff --git a/dev-lisp/clozurecl/clozurecl-1.11-r1.ebuild b/dev-lisp/clozurecl/clozurecl-1.11-r1.ebuild
deleted file mode 100644
index 5a39a3a..0000000
--- a/dev-lisp/clozurecl/clozurecl-1.11-r1.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit eutils multilib toolchain-funcs
-
-MY_PN=ccl
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Common Lisp implementation, derived from Digitool's MCL product"
-HOMEPAGE="http://ccl.clozure.com/"
-SRC_URI="
- x86? ( ftp://ftp.clozure.com/pub/release/${PV}/${MY_P}-linuxx86.tar.gz )
- amd64? ( ftp://ftp.clozure.com/pub/release/${PV}/${MY_P}-linuxx86.tar.gz )
- doc? ( http://ccl.clozure.com/docs/ccl.html )"
- # ppc? ( ftp://ftp.clozure.com/pub/release/${PV}/${MY_P}-linuxppc.tar.gz )
- # ppc64? ( ftp://ftp.clozure.com/pub/release/${PV}/${MY_P}-linuxppc.tar.gz )"
-
-LICENSE="LLGPL-2.1"
-SLOT="0"
-# KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=dev-lisp/asdf-2.33-r3:="
-DEPEND="${RDEPEND}
- !dev-lisp/openmcl"
-
-S="${WORKDIR}"/${MY_PN}
-PATCHES=( "${FILESDIR}"/ccl-format.patch )
-ENVD="${T}"/50ccl
-
-src_configure() {
- if use x86; then
- CCL_RUNTIME=lx86cl; CCL_HEADERS=x86-headers; CCL_KERNEL=linuxx8632
- elif use amd64; then
- CCL_RUNTIME=lx86cl64; CCL_HEADERS=x86-headers64; CCL_KERNEL=linuxx8664
- elif use ppc; then
- CCL_RUNTIME=ppccl; CCL_HEADERS=headers; CCL_KERNEL=linuxppc
- elif use ppc64; then
- CCL_RUNTIME=ppccl64; CCL_HEADERS=headers64; CCL_KERNEL=linuxppc64
- fi
-}
-
-src_prepare() {
- default
- cp /usr/share/common-lisp/source/asdf/build/asdf.lisp tools/ || die
-}
-
-src_compile() {
- emake -C lisp-kernel/${CCL_KERNEL} clean
- emake -C lisp-kernel/${CCL_KERNEL} all CC="$(tc-getCC)"
-
- unset CCL_DEFAULT_DIRECTORY
- ./${CCL_RUNTIME} -n -b -Q -e '(ccl:rebuild-ccl :full t)' -e '(ccl:quit)' || die "Compilation failed"
-
- # remove non-owner write permissions on the full-image
- chmod go-w ${CCL_RUNTIME}{,.image} || die
-
- esvn_clean
-}
-
-src_install() {
- local install_dir=/usr/$(get_libdir)/${PN}
-
- exeinto ${install_dir}
- # install executable
- doexe ${CCL_RUNTIME}
- # install core image
- cp ${CCL_RUNTIME}.image "${D}"/${install_dir} || die
- # install optional libraries
- dodir ${install_dir}/tools
- cp tools/*fsl "${D}"/${install_dir}/tools || die
-
- # until we figure out which source files are necessary for runtime
- # optional features and which aren't, we install all sources
- find . -type f -name '*fsl' -delete || die
- rm -f lisp-kernel/${CCL_KERNEL}/*.o || die
- cp -a compiler level-0 level-1 lib library \
- lisp-kernel scripts tools xdump contrib \
- "${D}"/${install_dir} || die
- cp -a ${CCL_HEADERS} "${D}"/${install_dir} || die
-
- make_wrapper ccl "${install_dir}/${CCL_RUNTIME}"
-
- echo "CCL_DEFAULT_DIRECTORY=${install_dir}" > "${ENVD}"
- doenvd "${ENVD}"
-
- dodoc doc/release-notes.txt
- use doc && dodoc "${DISTDIR}"/ccl.html
- use doc && dodoc -r examples
-}
diff --git a/dev-lisp/clozurecl/files/ccl-format.patch b/dev-lisp/clozurecl/files/ccl-format.patch
deleted file mode 100644
index c2df37c..0000000
--- a/dev-lisp/clozurecl/files/ccl-format.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-diff -r -U1 ccl.orig/lib/format.lisp ccl/lib/format.lisp
---- ccl.orig/lib/format.lisp 2015-11-07 02:10:10.000000000 +0600
-+++ ccl/lib/format.lisp 2015-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
-+ (>= (+ r m+) s)
-+ (> (+ r m+) s))
-+ (+ k 1)
-+ k))
-+ (scale (r s m+)
-+ (let* ((est (flog v))
-+ (scale (the integer (10-to-e (abs est)))))
-+ (if (>= est 0)
-+ (fixup r (* s scale) m+ est)
-+ (fixup (* r scale) s (* m+ scale) est)))))
-+ (let (r s m+)
-+ (if (>= e 0)
-+ (let* ((be (expt float-radix e))
-+ (be1 (* be float-radix)))
-+ (if (/= f (expt float-radix (1- float-digits)))
-+ (setf r (* f be 2)
-+ s 2
-+ m+ be)
-+ (setf r (* f be1 2)
-+ s (* float-radix 2)
-+ m+ be1)))
-+ (if (or (= e min-e)
-+ (/= f (expt float-radix (1- float-digits))))
-+ (setf r (* f 2)
-+ s (* (expt float-radix (- e)) 2)
-+ m+ 1)
-+ (setf r (* f float-radix 2)
-+ s (* (expt float-radix (- 1 e)) 2)
-+ m+ float-radix)))
-+ (scale r s m+))))))))
-
-@@ -1922,3 +1952,3 @@
- (format-error "incompatible values for k and d")))
-- (when (not exp) (setq exp (scale-exponent number)))
-+ (when (not exp) (setq exp (accurate-scale-exponent (abs number))))
- AGAIN
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lisp/clozurecl/files/, dev-lisp/clozurecl/
@ 2015-11-22 19:51 Ulrich Müller
0 siblings, 0 replies; 5+ messages in thread
From: Ulrich Müller @ 2015-11-22 19:51 UTC (permalink / raw
To: gentoo-commits
commit: dc9d07ba16291325c42886e75511078fa3418ccb
Author: Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 21 04:52:27 2015 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 22 19:46:14 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc9d07ba
dev-lisp/clozurecl: fix bug with the ~e format
Upstream patch http://trac.clozure.com/ccl/changeset/16639
Bug: http://trac.clozure.com/ccl/ticket/563, http://trac.clozure.com/ccl/ticket/1186
Package-Manager: portage-2.2.25
dev-lisp/clozurecl/clozurecl-1.11-r1.ebuild | 94 ++++++++++++++++++++
dev-lisp/clozurecl/files/ccl-format.patch | 128 ++++++++++++++++++++++++++++
2 files changed, 222 insertions(+)
diff --git a/dev-lisp/clozurecl/clozurecl-1.11-r1.ebuild b/dev-lisp/clozurecl/clozurecl-1.11-r1.ebuild
new file mode 100644
index 0000000..5a39a3a
--- /dev/null
+++ b/dev-lisp/clozurecl/clozurecl-1.11-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils multilib toolchain-funcs
+
+MY_PN=ccl
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Common Lisp implementation, derived from Digitool's MCL product"
+HOMEPAGE="http://ccl.clozure.com/"
+SRC_URI="
+ x86? ( ftp://ftp.clozure.com/pub/release/${PV}/${MY_P}-linuxx86.tar.gz )
+ amd64? ( ftp://ftp.clozure.com/pub/release/${PV}/${MY_P}-linuxx86.tar.gz )
+ doc? ( http://ccl.clozure.com/docs/ccl.html )"
+ # ppc? ( ftp://ftp.clozure.com/pub/release/${PV}/${MY_P}-linuxppc.tar.gz )
+ # ppc64? ( ftp://ftp.clozure.com/pub/release/${PV}/${MY_P}-linuxppc.tar.gz )"
+
+LICENSE="LLGPL-2.1"
+SLOT="0"
+# KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND=">=dev-lisp/asdf-2.33-r3:="
+DEPEND="${RDEPEND}
+ !dev-lisp/openmcl"
+
+S="${WORKDIR}"/${MY_PN}
+PATCHES=( "${FILESDIR}"/ccl-format.patch )
+ENVD="${T}"/50ccl
+
+src_configure() {
+ if use x86; then
+ CCL_RUNTIME=lx86cl; CCL_HEADERS=x86-headers; CCL_KERNEL=linuxx8632
+ elif use amd64; then
+ CCL_RUNTIME=lx86cl64; CCL_HEADERS=x86-headers64; CCL_KERNEL=linuxx8664
+ elif use ppc; then
+ CCL_RUNTIME=ppccl; CCL_HEADERS=headers; CCL_KERNEL=linuxppc
+ elif use ppc64; then
+ CCL_RUNTIME=ppccl64; CCL_HEADERS=headers64; CCL_KERNEL=linuxppc64
+ fi
+}
+
+src_prepare() {
+ default
+ cp /usr/share/common-lisp/source/asdf/build/asdf.lisp tools/ || die
+}
+
+src_compile() {
+ emake -C lisp-kernel/${CCL_KERNEL} clean
+ emake -C lisp-kernel/${CCL_KERNEL} all CC="$(tc-getCC)"
+
+ unset CCL_DEFAULT_DIRECTORY
+ ./${CCL_RUNTIME} -n -b -Q -e '(ccl:rebuild-ccl :full t)' -e '(ccl:quit)' || die "Compilation failed"
+
+ # remove non-owner write permissions on the full-image
+ chmod go-w ${CCL_RUNTIME}{,.image} || die
+
+ esvn_clean
+}
+
+src_install() {
+ local install_dir=/usr/$(get_libdir)/${PN}
+
+ exeinto ${install_dir}
+ # install executable
+ doexe ${CCL_RUNTIME}
+ # install core image
+ cp ${CCL_RUNTIME}.image "${D}"/${install_dir} || die
+ # install optional libraries
+ dodir ${install_dir}/tools
+ cp tools/*fsl "${D}"/${install_dir}/tools || die
+
+ # until we figure out which source files are necessary for runtime
+ # optional features and which aren't, we install all sources
+ find . -type f -name '*fsl' -delete || die
+ rm -f lisp-kernel/${CCL_KERNEL}/*.o || die
+ cp -a compiler level-0 level-1 lib library \
+ lisp-kernel scripts tools xdump contrib \
+ "${D}"/${install_dir} || die
+ cp -a ${CCL_HEADERS} "${D}"/${install_dir} || die
+
+ make_wrapper ccl "${install_dir}/${CCL_RUNTIME}"
+
+ echo "CCL_DEFAULT_DIRECTORY=${install_dir}" > "${ENVD}"
+ doenvd "${ENVD}"
+
+ dodoc doc/release-notes.txt
+ use doc && dodoc "${DISTDIR}"/ccl.html
+ use doc && dodoc -r examples
+}
diff --git a/dev-lisp/clozurecl/files/ccl-format.patch b/dev-lisp/clozurecl/files/ccl-format.patch
new file mode 100644
index 0000000..c2df37c
--- /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.000000000 +0600
++++ ccl/lib/format.lisp 2015-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
++ (>= (+ r m+) s)
++ (> (+ r m+) s))
++ (+ k 1)
++ k))
++ (scale (r s m+)
++ (let* ((est (flog v))
++ (scale (the integer (10-to-e (abs est)))))
++ (if (>= est 0)
++ (fixup r (* s scale) m+ est)
++ (fixup (* r scale) s (* m+ scale) est)))))
++ (let (r s m+)
++ (if (>= e 0)
++ (let* ((be (expt float-radix e))
++ (be1 (* be float-radix)))
++ (if (/= f (expt float-radix (1- float-digits)))
++ (setf r (* f be 2)
++ s 2
++ m+ be)
++ (setf r (* f be1 2)
++ s (* float-radix 2)
++ m+ be1)))
++ (if (or (= e min-e)
++ (/= f (expt float-radix (1- float-digits))))
++ (setf r (* f 2)
++ s (* (expt float-radix (- e)) 2)
++ m+ 1)
++ (setf r (* f float-radix 2)
++ s (* (expt float-radix (- 1 e)) 2)
++ m+ float-radix)))
++ (scale r s m+))))))))
+
+@@ -1922,3 +1952,3 @@
+ (format-error "incompatible values for k and d")))
+- (when (not exp) (setq exp (scale-exponent number)))
++ (when (not exp) (setq exp (accurate-scale-exponent (abs number))))
+ AGAIN
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lisp/clozurecl/files/, dev-lisp/clozurecl/
@ 2017-11-21 17:09 Andrey Grozin
0 siblings, 0 replies; 5+ messages in thread
From: Andrey Grozin @ 2017-11-21 17:09 UTC (permalink / raw
To: gentoo-commits
commit: 25062be3a7b4ff2c5fbbb7a3f7401c7c8b9b2e09
Author: Andrey Grozin <grozin <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 21 17:08:21 2017 +0000
Commit: Andrey Grozin <grozin <AT> gentoo <DOT> org>
CommitDate: Tue Nov 21 17:08:21 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=25062be3
dev-lisp/clozurecl: add the upstream patch for compatibility with glibc-2.26
Closes: https://bugs.gentoo.org/638304
Package-Manager: Portage-2.3.14, Repoman-2.3.6
dev-lisp/clozurecl/clozurecl-1.11-r3.ebuild | 102 +++++++++++++++++++++
dev-lisp/clozurecl/files/ccl-1.11-glibc-2.26.patch | 41 +++++++++
2 files changed, 143 insertions(+)
diff --git a/dev-lisp/clozurecl/clozurecl-1.11-r3.ebuild b/dev-lisp/clozurecl/clozurecl-1.11-r3.ebuild
new file mode 100644
index 00000000000..5482af1a6e1
--- /dev/null
+++ b/dev-lisp/clozurecl/clozurecl-1.11-r3.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils flag-o-matic multilib toolchain-funcs
+
+MY_PN=ccl
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Common Lisp implementation, derived from Digitool's MCL product"
+HOMEPAGE="https://ccl.clozure.com"
+SRC_URI="
+ x86? ( ${HOMEPAGE}/ftp/pub/release/${PV}/${MY_P}-linuxx86.tar.gz )
+ amd64? ( ${HOMEPAGE}/ftp/pub/release/${PV}/${MY_P}-linuxx86.tar.gz )
+ arm? ( ${HOMEPAGE}/ftp/pub/release/${PV}/${MY_P}-linuxarm.tar.gz )
+ x86-macos? ( ${HOMEPAGE}/ftp/pub/release/${PV}/${MY_P}-darwinx86.tar.gz )
+ x64-macos? ( ${HOMEPAGE}/ftp/pub/release/${PV}/${MY_P}-darwinx86.tar.gz )
+ x86-solaris? ( ${HOMEPAGE}/ftp/pub/release/${PV}/${MY_P}-solarisx86.tar.gz )
+ x64-solaris? ( ${HOMEPAGE}/ftp/pub/release/${PV}/${MY_P}-solarisx86.tar.gz )
+ doc? ( ${HOMEPAGE}/docs/ccl.html )"
+
+LICENSE="LLGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="doc"
+
+RDEPEND=">=dev-lisp/asdf-2.33-r3:="
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${MY_PN}
+ENVD="${T}/50ccl"
+
+src_configure() {
+ if use x86-macos; then
+ CCL_RUNTIME=dx86cl; CCL_HEADERS=darwin-x86-headers; CCL_KERNEL=darwinx8632
+ elif use x64-macos; then
+ CCL_RUNTIME=dx86cl64; CCL_HEADERS=darwin-x86-headers64; CCL_KERNEL=darwinx8664
+ elif use x86-solaris; then
+ CCL_RUNTIME=sx86cl; CCL_HEADERS=solarisx86-headers; CCL_KERNEL=solarisx86
+ elif use x64-solaris; then
+ CCL_RUNTIME=sx86cl64; CCL_HEADERS=solarisx64-headers; CCL_KERNEL=solarisx64
+ elif use x86; then
+ CCL_RUNTIME=lx86cl; CCL_HEADERS=x86-headers; CCL_KERNEL=linuxx8632
+ elif use amd64; then
+ CCL_RUNTIME=lx86cl64; CCL_HEADERS=x86-headers64; CCL_KERNEL=linuxx8664
+ elif use arm; then
+ CCL_RUNTIME=armcl; CCL_HEADERS=arm-headers; CCL_KERNEL=linuxarm
+ elif use ppc; then
+ CCL_RUNTIME=ppccl; CCL_HEADERS=headers; CCL_KERNEL=linuxppc
+ elif use ppc64; then
+ CCL_RUNTIME=ppccl64; CCL_HEADERS=headers64; CCL_KERNEL=linuxppc64
+ fi
+}
+
+src_prepare() {
+ default
+ eapply "${FILESDIR}/${MY_PN}-format.patch"
+ # bug #638304 https://github.com/Clozure/ccl/commit/a87d61b88e1f48a563335062668970f7e6290ecf
+ eapply "${FILESDIR}/${MY_P}-glibc-2.26.patch"
+ # https://lists.clozure.com/pipermail/openmcl-devel/2016-September/011399.html
+ sed -i "s/-dynamic/-no_pie/" "${S}/lisp-kernel/darwinx8664/Makefile" || die
+ cp "${EPREFIX}/usr/share/common-lisp/source/asdf/build/asdf.lisp" tools/ || die
+}
+
+src_compile() {
+ emake -C lisp-kernel/${CCL_KERNEL} clean
+ emake -C lisp-kernel/${CCL_KERNEL} all CC="$(tc-getCC)"
+
+ unset CCL_DEFAULT_DIRECTORY
+ ./${CCL_RUNTIME} -n -b -Q -e '(ccl:rebuild-ccl :full t)' -e '(ccl:quit)' || die "Compilation failed"
+
+ # remove non-owner write permissions on the full-image
+ chmod go-w ${CCL_RUNTIME}{,.image} || die
+
+ esvn_clean
+}
+
+src_install() {
+ local target_dir="/usr/$(get_libdir)/${PN}"
+ local prefix_dir="${EPREFIX}/${target_dir#/}"
+
+ mkdir -p "${D}/${prefix_dir#/}"
+
+ find . -type f -name '*fsl' -delete || die
+ rm -f lisp-kernel/${CCL_KERNEL}/*.o || die
+ cp -a compiler contrib level-0 level-1 lib library lisp-kernel scripts \
+ tools xdump ${CCL_HEADERS} ${CCL_RUNTIME} ${CCL_RUNTIME}.image \
+ "${D}/${prefix_dir#/}" || die
+
+ echo "CCL_DEFAULT_DIRECTORY=${prefix_dir}" > "${ENVD}"
+ doenvd "${ENVD}"
+
+ dosym "${target_dir}/${CCL_RUNTIME}" /usr/bin/ccl
+ dodoc doc/release-notes.txt
+
+ if use doc ; then
+ dodoc "${DISTDIR}/ccl.html"
+ dodoc -r doc/manual
+ dodoc -r examples
+ fi
+}
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
new file mode 100644
index 00000000000..3a9bdf64e54
--- /dev/null
+++ b/dev-lisp/clozurecl/files/ccl-1.11-glibc-2.26.patch
@@ -0,0 +1,41 @@
+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.000000000 +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 <ucontext.h>
++
++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.000000000 +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 <ucontext.h>
++
++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.000000000 +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(&stack, NULL) != 0) {
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lisp/clozurecl/files/, dev-lisp/clozurecl/
@ 2018-05-18 19:01 José María Alonso
0 siblings, 0 replies; 5+ messages in thread
From: José María Alonso @ 2018-05-18 19:01 UTC (permalink / raw
To: gentoo-commits
commit: 27a2409d3cda7a4717e99da6da8bc6aed5a918a7
Author: Chema Alonso Josa <nimiux <AT> gentoo <DOT> org>
AuthorDate: Fri May 18 19:01:34 2018 +0000
Commit: José María Alonso <nimiux <AT> gentoo <DOT> org>
CommitDate: Fri May 18 19:01:34 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27a2409d
dev-lisp/clozurecl: Drop old version
Package-Manager: Portage-2.3.24, Repoman-2.3.6
dev-lisp/clozurecl/Manifest | 4 -
dev-lisp/clozurecl/clozurecl-1.11-r1.ebuild | 93 ---------------
dev-lisp/clozurecl/clozurecl-1.11-r2.ebuild | 100 ----------------
dev-lisp/clozurecl/clozurecl-1.11-r3.ebuild | 102 ----------------
dev-lisp/clozurecl/files/ccl-1.11-glibc-2.26.patch | 41 -------
dev-lisp/clozurecl/files/ccl-format.patch | 128 ---------------------
6 files changed, 468 deletions(-)
diff --git a/dev-lisp/clozurecl/Manifest b/dev-lisp/clozurecl/Manifest
index 3027f6ba6b7..bfc4b91eba6 100644
--- a/dev-lisp/clozurecl/Manifest
+++ b/dev-lisp/clozurecl/Manifest
@@ -1,7 +1,3 @@
-DIST ccl-1.11-darwinx86.tar.gz 152989219 BLAKE2B 73a1ceed3ff1a22d76f593fb35a850c8c449cec7646368cd306a2c63ae85e22e02a6d604dc115e3e0a02f69a0fd6b8e29721c5e58704101779bf6a6924a48741 SHA512 21107ab0cf6f5abee21fc561680eb722fbb0a0515ea99a1d02be091a85519b1a91444317d92117ad509a25dca97adaba9b2d8026a7214f58aa03172ada2ea340
-DIST ccl-1.11-linuxarm.tar.gz 23044178 BLAKE2B 509fbf0bd83a41d8115b87f4b79db799e063fb9f2dd21e58db24ec065101e6946315442104feaa61b1175c80ccaf5f5926fc73c2a3a87d4c3e5ba659269a644d SHA512 b8034569f0c47106107fee6bd859051052d43c3bcd625a1956eae467ef0225425d5429678e3584136adc929ccfbbe4b800bffa66ea758cd2b734aa3ed55a9dda
-DIST ccl-1.11-linuxx86.tar.gz 42482877 BLAKE2B d1a6977d7dd934c77db4dd0deb2ab53a85c0d118037e147ced09027578e5356770145da317f1887a8d7d25309b146864a62f54b0d5e841470c86da99c38cbd4b SHA512 34008654fd3ceca55a33413a768c398395141e26b9ea09204739ca7e998fdbe94ab92507eda14cf9bcbb9f76e6c3cae3006d7f2c9f48749c66e1f1281febb409
-DIST ccl-1.11-solarisx86.tar.gz 46926817 BLAKE2B 15c960cf16d16dd5fb7c7c2f2401a244c0fcba4cb92bdd9d72c6b16a572bc464999bbe503c37e6fd343bfe1883d4612efe9de4be38313c22dc406f65489ee0b2 SHA512 f35df9e9c7644331a0f6b77e7b0a6f0b2e297f6249ef7a669932ab6685ca426f87423faf01c64cc1f7eb7fcd0dd4fb7c0d70d039bbcadca5d9201b0a348a36be
DIST ccl-1.11.5-darwinx86.tar.gz 100515656 BLAKE2B d9ae52f7d0c481211fdf53bf6bb4bb65a66ab60bf1c3548e9f2d502e60906163121a85330e547d15e3d4bcb6ad47564e86dd93b4228a9391558463347011990f SHA512 1016ab9672839d1303809e9f5b849cf36dc300963672dfa5888b75f6dadee3106cd6f1375e544437a92c7307dc8639e423e12663ca157b851925d0e82f0cd4b7
DIST ccl-1.11.5-linuxarm.tar.gz 40288609 BLAKE2B 5217de314e6c59e5bbee7d5608b4e92088fb57dc0d8a90454ec4653c1710857748776d9a7ee2e89e86613f64fc028aca324ea5cb3bc7eb5e9bc582e2b50766cf SHA512 0305baa66263a2182ba8deb02837287ffb6c1472987d4953caa8839cad6503815ded7fe6bfde72a823b90d3ff86322602ee3d0934e179fb2418e3b049f55be4e
DIST ccl-1.11.5-linuxx86.tar.gz 50652181 BLAKE2B 2ed6e747a72816c6f79f58715261c41a1c3b98fa84ef4ee82ca5683383741777a46a566c7884d7fdc3dcd2e5959dab2f3fde9432945a4dc73bcece8f741ed753 SHA512 b6c16d9bba27a901f942237ed42d6b3e832910951270820a2a3d61afe2a8e7f59d383c854382cfcaa0bf8253c8d624be66d905b4170211ea39a106ca85b9a23d
diff --git a/dev-lisp/clozurecl/clozurecl-1.11-r1.ebuild b/dev-lisp/clozurecl/clozurecl-1.11-r1.ebuild
deleted file mode 100644
index 511c012b714..00000000000
--- a/dev-lisp/clozurecl/clozurecl-1.11-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils multilib toolchain-funcs
-
-MY_PN=ccl
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Common Lisp implementation, derived from Digitool's MCL product"
-HOMEPAGE="https://ccl.clozure.com/"
-SRC_URI="
- x86? ( ftp://ftp.clozure.com/pub/release/${PV}/${MY_P}-linuxx86.tar.gz )
- amd64? ( ftp://ftp.clozure.com/pub/release/${PV}/${MY_P}-linuxx86.tar.gz )
- doc? ( https://ccl.clozure.com/docs/ccl.html )"
- # ppc? ( ftp://ftp.clozure.com/pub/release/${PV}/${MY_P}-linuxppc.tar.gz )
- # ppc64? ( ftp://ftp.clozure.com/pub/release/${PV}/${MY_P}-linuxppc.tar.gz )"
-
-LICENSE="LLGPL-2.1"
-SLOT="0"
-# KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-RDEPEND=">=dev-lisp/asdf-2.33-r3:="
-DEPEND="${RDEPEND}
- !dev-lisp/openmcl"
-
-S="${WORKDIR}"/${MY_PN}
-ENVD="${T}"/50ccl
-
-src_configure() {
- if use x86; then
- CCL_RUNTIME=lx86cl; CCL_HEADERS=x86-headers; CCL_KERNEL=linuxx8632
- elif use amd64; then
- CCL_RUNTIME=lx86cl64; CCL_HEADERS=x86-headers64; CCL_KERNEL=linuxx8664
- elif use ppc; then
- CCL_RUNTIME=ppccl; CCL_HEADERS=headers; CCL_KERNEL=linuxppc
- elif use ppc64; then
- CCL_RUNTIME=ppccl64; CCL_HEADERS=headers64; CCL_KERNEL=linuxppc64
- fi
-}
-
-src_prepare() {
- default
- epatch "${FILESDIR}"/ccl-format.patch
- cp /usr/share/common-lisp/source/asdf/build/asdf.lisp tools/ || die
-}
-
-src_compile() {
- emake -C lisp-kernel/${CCL_KERNEL} clean
- emake -C lisp-kernel/${CCL_KERNEL} all CC="$(tc-getCC)"
-
- unset CCL_DEFAULT_DIRECTORY
- ./${CCL_RUNTIME} -n -b -Q -e '(ccl:rebuild-ccl :full t)' -e '(ccl:quit)' || die "Compilation failed"
-
- # remove non-owner write permissions on the full-image
- chmod go-w ${CCL_RUNTIME}{,.image} || die
-
- esvn_clean
-}
-
-src_install() {
- local install_dir=/usr/$(get_libdir)/${PN}
-
- exeinto ${install_dir}
- # install executable
- doexe ${CCL_RUNTIME}
- # install core image
- cp ${CCL_RUNTIME}.image "${D}"/${install_dir} || die
- # install optional libraries
- dodir ${install_dir}/tools
- cp tools/*fsl "${D}"/${install_dir}/tools || die
-
- # until we figure out which source files are necessary for runtime
- # optional features and which aren't, we install all sources
- find . -type f -name '*fsl' -delete || die
- rm -f lisp-kernel/${CCL_KERNEL}/*.o || die
- cp -a compiler level-0 level-1 lib library \
- lisp-kernel scripts tools xdump contrib \
- "${D}"/${install_dir} || die
- cp -a ${CCL_HEADERS} "${D}"/${install_dir} || die
-
- make_wrapper ccl "${install_dir}/${CCL_RUNTIME}"
-
- echo "CCL_DEFAULT_DIRECTORY=${install_dir}" > "${ENVD}"
- doenvd "${ENVD}"
-
- dodoc doc/release-notes.txt
- use doc && dodoc "${DISTDIR}"/ccl.html
- use doc && dodoc -r examples
-}
diff --git a/dev-lisp/clozurecl/clozurecl-1.11-r2.ebuild b/dev-lisp/clozurecl/clozurecl-1.11-r2.ebuild
deleted file mode 100644
index 8c1c342d870..00000000000
--- a/dev-lisp/clozurecl/clozurecl-1.11-r2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-MY_PN=ccl
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Common Lisp implementation, derived from Digitool's MCL product"
-HOMEPAGE="https://ccl.clozure.com"
-SRC_URI="
- x86? ( ${HOMEPAGE}/ftp/pub/release/${PV}/${MY_P}-linuxx86.tar.gz )
- amd64? ( ${HOMEPAGE}/ftp/pub/release/${PV}/${MY_P}-linuxx86.tar.gz )
- arm? ( ${HOMEPAGE}/ftp/pub/release/${PV}/${MY_P}-linuxarm.tar.gz )
- x86-macos? ( ${HOMEPAGE}/ftp/pub/release/${PV}/${MY_P}-darwinx86.tar.gz )
- x64-macos? ( ${HOMEPAGE}/ftp/pub/release/${PV}/${MY_P}-darwinx86.tar.gz )
- x86-solaris? ( ${HOMEPAGE}/ftp/pub/release/${PV}/${MY_P}-solarisx86.tar.gz )
- x64-solaris? ( ${HOMEPAGE}/ftp/pub/release/${PV}/${MY_P}-solarisx86.tar.gz )
- doc? ( ${HOMEPAGE}/docs/ccl.html )"
-
-LICENSE="LLGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc"
-
-RDEPEND=">=dev-lisp/asdf-2.33-r3:="
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_PN}
-ENVD="${T}/50ccl"
-
-src_configure() {
- if use x86-macos; then
- CCL_RUNTIME=dx86cl; CCL_HEADERS=darwin-x86-headers; CCL_KERNEL=darwinx8632
- elif use x64-macos; then
- CCL_RUNTIME=dx86cl64; CCL_HEADERS=darwin-x86-headers64; CCL_KERNEL=darwinx8664
- elif use x86-solaris; then
- CCL_RUNTIME=sx86cl; CCL_HEADERS=solarisx86-headers; CCL_KERNEL=solarisx86
- elif use x64-solaris; then
- CCL_RUNTIME=sx86cl64; CCL_HEADERS=solarisx64-headers; CCL_KERNEL=solarisx64
- elif use x86; then
- CCL_RUNTIME=lx86cl; CCL_HEADERS=x86-headers; CCL_KERNEL=linuxx8632
- elif use amd64; then
- CCL_RUNTIME=lx86cl64; CCL_HEADERS=x86-headers64; CCL_KERNEL=linuxx8664
- elif use arm; then
- CCL_RUNTIME=armcl; CCL_HEADERS=arm-headers; CCL_KERNEL=linuxarm
- elif use ppc; then
- CCL_RUNTIME=ppccl; CCL_HEADERS=headers; CCL_KERNEL=linuxppc
- elif use ppc64; then
- CCL_RUNTIME=ppccl64; CCL_HEADERS=headers64; CCL_KERNEL=linuxppc64
- fi
-}
-
-src_prepare() {
- default
- eapply "${FILESDIR}/${MY_PN}-format.patch"
- # https://lists.clozure.com/pipermail/openmcl-devel/2016-September/011399.html
- sed -i "s/-dynamic/-no_pie/" "${S}/lisp-kernel/darwinx8664/Makefile" || die
- cp "${EPREFIX}/usr/share/common-lisp/source/asdf/build/asdf.lisp" tools/ || die
-}
-
-src_compile() {
- emake -C lisp-kernel/${CCL_KERNEL} clean
- emake -C lisp-kernel/${CCL_KERNEL} all CC="$(tc-getCC)"
-
- unset CCL_DEFAULT_DIRECTORY
- ./${CCL_RUNTIME} -n -b -Q -e '(ccl:rebuild-ccl :full t)' -e '(ccl:quit)' || die "Compilation failed"
-
- # remove non-owner write permissions on the full-image
- chmod go-w ${CCL_RUNTIME}{,.image} || die
-
- esvn_clean
-}
-
-src_install() {
- local target_dir="/usr/$(get_libdir)/${PN}"
- local prefix_dir="${EPREFIX}/${target_dir#/}"
-
- mkdir -p "${D}/${prefix_dir#/}"
-
- find . -type f -name '*fsl' -delete || die
- rm -f lisp-kernel/${CCL_KERNEL}/*.o || die
- cp -a compiler contrib level-0 level-1 lib library lisp-kernel scripts \
- tools xdump ${CCL_HEADERS} ${CCL_RUNTIME} ${CCL_RUNTIME}.image \
- "${D}/${prefix_dir#/}" || die
-
- echo "CCL_DEFAULT_DIRECTORY=${prefix_dir}" > "${ENVD}"
- doenvd "${ENVD}"
-
- dosym "${target_dir}/${CCL_RUNTIME}" /usr/bin/ccl
- dodoc doc/release-notes.txt
-
- if use doc ; then
- dodoc "${DISTDIR}/ccl.html"
- dodoc -r doc/manual
- dodoc -r examples
- fi
-}
diff --git a/dev-lisp/clozurecl/clozurecl-1.11-r3.ebuild b/dev-lisp/clozurecl/clozurecl-1.11-r3.ebuild
deleted file mode 100644
index 5482af1a6e1..00000000000
--- a/dev-lisp/clozurecl/clozurecl-1.11-r3.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils flag-o-matic multilib toolchain-funcs
-
-MY_PN=ccl
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Common Lisp implementation, derived from Digitool's MCL product"
-HOMEPAGE="https://ccl.clozure.com"
-SRC_URI="
- x86? ( ${HOMEPAGE}/ftp/pub/release/${PV}/${MY_P}-linuxx86.tar.gz )
- amd64? ( ${HOMEPAGE}/ftp/pub/release/${PV}/${MY_P}-linuxx86.tar.gz )
- arm? ( ${HOMEPAGE}/ftp/pub/release/${PV}/${MY_P}-linuxarm.tar.gz )
- x86-macos? ( ${HOMEPAGE}/ftp/pub/release/${PV}/${MY_P}-darwinx86.tar.gz )
- x64-macos? ( ${HOMEPAGE}/ftp/pub/release/${PV}/${MY_P}-darwinx86.tar.gz )
- x86-solaris? ( ${HOMEPAGE}/ftp/pub/release/${PV}/${MY_P}-solarisx86.tar.gz )
- x64-solaris? ( ${HOMEPAGE}/ftp/pub/release/${PV}/${MY_P}-solarisx86.tar.gz )
- doc? ( ${HOMEPAGE}/docs/ccl.html )"
-
-LICENSE="LLGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc"
-
-RDEPEND=">=dev-lisp/asdf-2.33-r3:="
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_PN}
-ENVD="${T}/50ccl"
-
-src_configure() {
- if use x86-macos; then
- CCL_RUNTIME=dx86cl; CCL_HEADERS=darwin-x86-headers; CCL_KERNEL=darwinx8632
- elif use x64-macos; then
- CCL_RUNTIME=dx86cl64; CCL_HEADERS=darwin-x86-headers64; CCL_KERNEL=darwinx8664
- elif use x86-solaris; then
- CCL_RUNTIME=sx86cl; CCL_HEADERS=solarisx86-headers; CCL_KERNEL=solarisx86
- elif use x64-solaris; then
- CCL_RUNTIME=sx86cl64; CCL_HEADERS=solarisx64-headers; CCL_KERNEL=solarisx64
- elif use x86; then
- CCL_RUNTIME=lx86cl; CCL_HEADERS=x86-headers; CCL_KERNEL=linuxx8632
- elif use amd64; then
- CCL_RUNTIME=lx86cl64; CCL_HEADERS=x86-headers64; CCL_KERNEL=linuxx8664
- elif use arm; then
- CCL_RUNTIME=armcl; CCL_HEADERS=arm-headers; CCL_KERNEL=linuxarm
- elif use ppc; then
- CCL_RUNTIME=ppccl; CCL_HEADERS=headers; CCL_KERNEL=linuxppc
- elif use ppc64; then
- CCL_RUNTIME=ppccl64; CCL_HEADERS=headers64; CCL_KERNEL=linuxppc64
- fi
-}
-
-src_prepare() {
- default
- eapply "${FILESDIR}/${MY_PN}-format.patch"
- # bug #638304 https://github.com/Clozure/ccl/commit/a87d61b88e1f48a563335062668970f7e6290ecf
- eapply "${FILESDIR}/${MY_P}-glibc-2.26.patch"
- # https://lists.clozure.com/pipermail/openmcl-devel/2016-September/011399.html
- sed -i "s/-dynamic/-no_pie/" "${S}/lisp-kernel/darwinx8664/Makefile" || die
- cp "${EPREFIX}/usr/share/common-lisp/source/asdf/build/asdf.lisp" tools/ || die
-}
-
-src_compile() {
- emake -C lisp-kernel/${CCL_KERNEL} clean
- emake -C lisp-kernel/${CCL_KERNEL} all CC="$(tc-getCC)"
-
- unset CCL_DEFAULT_DIRECTORY
- ./${CCL_RUNTIME} -n -b -Q -e '(ccl:rebuild-ccl :full t)' -e '(ccl:quit)' || die "Compilation failed"
-
- # remove non-owner write permissions on the full-image
- chmod go-w ${CCL_RUNTIME}{,.image} || die
-
- esvn_clean
-}
-
-src_install() {
- local target_dir="/usr/$(get_libdir)/${PN}"
- local prefix_dir="${EPREFIX}/${target_dir#/}"
-
- mkdir -p "${D}/${prefix_dir#/}"
-
- find . -type f -name '*fsl' -delete || die
- rm -f lisp-kernel/${CCL_KERNEL}/*.o || die
- cp -a compiler contrib level-0 level-1 lib library lisp-kernel scripts \
- tools xdump ${CCL_HEADERS} ${CCL_RUNTIME} ${CCL_RUNTIME}.image \
- "${D}/${prefix_dir#/}" || die
-
- echo "CCL_DEFAULT_DIRECTORY=${prefix_dir}" > "${ENVD}"
- doenvd "${ENVD}"
-
- dosym "${target_dir}/${CCL_RUNTIME}" /usr/bin/ccl
- dodoc doc/release-notes.txt
-
- if use doc ; then
- dodoc "${DISTDIR}/ccl.html"
- dodoc -r doc/manual
- dodoc -r examples
- fi
-}
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 3a9bdf64e54..00000000000
--- 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.000000000 +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 <ucontext.h>
-+
-+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.000000000 +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 <ucontext.h>
-+
-+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.000000000 +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(&stack, NULL) != 0) {
diff --git a/dev-lisp/clozurecl/files/ccl-format.patch b/dev-lisp/clozurecl/files/ccl-format.patch
deleted file mode 100644
index c2df37c2b87..00000000000
--- a/dev-lisp/clozurecl/files/ccl-format.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-diff -r -U1 ccl.orig/lib/format.lisp ccl/lib/format.lisp
---- ccl.orig/lib/format.lisp 2015-11-07 02:10:10.000000000 +0600
-+++ ccl/lib/format.lisp 2015-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
-+ (>= (+ r m+) s)
-+ (> (+ r m+) s))
-+ (+ k 1)
-+ k))
-+ (scale (r s m+)
-+ (let* ((est (flog v))
-+ (scale (the integer (10-to-e (abs est)))))
-+ (if (>= est 0)
-+ (fixup r (* s scale) m+ est)
-+ (fixup (* r scale) s (* m+ scale) est)))))
-+ (let (r s m+)
-+ (if (>= e 0)
-+ (let* ((be (expt float-radix e))
-+ (be1 (* be float-radix)))
-+ (if (/= f (expt float-radix (1- float-digits)))
-+ (setf r (* f be 2)
-+ s 2
-+ m+ be)
-+ (setf r (* f be1 2)
-+ s (* float-radix 2)
-+ m+ be1)))
-+ (if (or (= e min-e)
-+ (/= f (expt float-radix (1- float-digits))))
-+ (setf r (* f 2)
-+ s (* (expt float-radix (- e)) 2)
-+ m+ 1)
-+ (setf r (* f float-radix 2)
-+ s (* (expt float-radix (- 1 e)) 2)
-+ m+ float-radix)))
-+ (scale r s m+))))))))
-
-@@ -1922,3 +1952,3 @@
- (format-error "incompatible values for k and d")))
-- (when (not exp) (setq exp (scale-exponent number)))
-+ (when (not exp) (setq exp (accurate-scale-exponent (abs number))))
- AGAIN
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-lisp/clozurecl/files/, dev-lisp/clozurecl/
@ 2023-09-19 7:32 Ulrich Müller
0 siblings, 0 replies; 5+ messages in thread
From: Ulrich Müller @ 2023-09-19 7:32 UTC (permalink / raw
To: gentoo-commits
commit: f20bd4da7aa884071e767321f9b97651222712db
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 19 07:30:26 2023 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Sep 19 07:30:26 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f20bd4da
dev-lisp/clozurecl: drop 1.11.5, 1.12, 1.12.1
Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org>
dev-lisp/clozurecl/Manifest | 9 --
dev-lisp/clozurecl/clozurecl-1.11.5.ebuild | 96 ------------------
dev-lisp/clozurecl/clozurecl-1.12.1.ebuild | 81 ---------------
dev-lisp/clozurecl/clozurecl-1.12.ebuild | 95 ------------------
.../files/clozurecl-1.11.5-fno-common.patch | 110 ---------------------
.../files/clozurecl-1.11.5-no-pie-32.patch | 7 --
6 files changed, 398 deletions(-)
diff --git a/dev-lisp/clozurecl/Manifest b/dev-lisp/clozurecl/Manifest
index d06d4a0bc8a4..8b29ee1a98d7 100644
--- a/dev-lisp/clozurecl/Manifest
+++ b/dev-lisp/clozurecl/Manifest
@@ -1,12 +1,3 @@
-DIST ccl-1.11.5-darwinx86.tar.gz 100515656 BLAKE2B d9ae52f7d0c481211fdf53bf6bb4bb65a66ab60bf1c3548e9f2d502e60906163121a85330e547d15e3d4bcb6ad47564e86dd93b4228a9391558463347011990f SHA512 1016ab9672839d1303809e9f5b849cf36dc300963672dfa5888b75f6dadee3106cd6f1375e544437a92c7307dc8639e423e12663ca157b851925d0e82f0cd4b7
-DIST ccl-1.11.5-linuxarm.tar.gz 40288609 BLAKE2B 5217de314e6c59e5bbee7d5608b4e92088fb57dc0d8a90454ec4653c1710857748776d9a7ee2e89e86613f64fc028aca324ea5cb3bc7eb5e9bc582e2b50766cf SHA512 0305baa66263a2182ba8deb02837287ffb6c1472987d4953caa8839cad6503815ded7fe6bfde72a823b90d3ff86322602ee3d0934e179fb2418e3b049f55be4e
-DIST ccl-1.11.5-linuxx86.tar.gz 50652181 BLAKE2B 2ed6e747a72816c6f79f58715261c41a1c3b98fa84ef4ee82ca5683383741777a46a566c7884d7fdc3dcd2e5959dab2f3fde9432945a4dc73bcece8f741ed753 SHA512 b6c16d9bba27a901f942237ed42d6b3e832910951270820a2a3d61afe2a8e7f59d383c854382cfcaa0bf8253c8d624be66d905b4170211ea39a106ca85b9a23d
-DIST ccl-1.11.5-solarisx86.tar.gz 59139069 BLAKE2B db1a904dd4e794127e7c966a9734aa92bb0415520a6af35d92008fd785004bd2ea04deb66f600b1d1dd60c0b95519e86d412b208878aaa6c2f9f8c05a27efe38 SHA512 4ae7cee7e35de41ab20d79e073b12b6bd98a23beea95c0de7d882a1f4e1ea3f9f3162844df0578aeeadb671d30a0a488092ee93b35245c693051a4ab9193fc5b
-DIST ccl-1.12-darwinx86.tar.gz 23943561 BLAKE2B 99bddb8b0de0aeb6038301fe74265bc8dd5f8d69122cd50bb06831b3d83c08837bf7b05b74a03fa9ce6ed90025192ee14e66d642a32b08da03c8bb2b7455e9da SHA512 d56bae52af8b89d013226148a754e21e77e088c2060547adbeb93007c2cc3f2b1457099972205e8bdb3ae6d8359058658dd3ad7c6bdda2f3555b6eaed7268859
-DIST ccl-1.12-linuxx86.tar.gz 20878539 BLAKE2B 474b8ff10131ba50b208060aa8f822361c019d5a483f71baf49663b83f1207291e45950e3e7fe741638318b014891bb717574f01632fd069ec801bceac99c124 SHA512 70ba4bb49b560ea2fd51603ae3ca4fba270ab00d94ef87ed8f4910397eaab11d28ccd69573e2ada1c3023d15c2b2fd6a7184575665de1c799768cd1c6f55de06
-DIST ccl-1.12-solarisx86.tar.gz 16902471 BLAKE2B 640eeb6f4673d3d2e824c0726e935c391961d70be4360476cba41af79864a60dbcf9769a6ef2938c5363fd7107c5f058e85b31cca5deb45c9c134f48540816ba SHA512 aa5ce2186ebd8093d21e71907ee0b4d33fc6d4ced456fbec4aa2f3434943df1ad5b3d5473a5d626e26b24607b9c6cfe03cb1c0ec14eeb1347df79f9136c756b5
-DIST ccl-1.12.1-darwinx86.tar.gz 23931965 BLAKE2B e7d010ccce860fef9508e6d0f389ab0cdb805045f380366d1384a0714c1c49ce829c97be5b1c2c6c6cfbc912799fc955b12cfd3b851982b06f4708c2da49dabb SHA512 b601d7503808589ea05edc196c5e6b14521b1e8afa3aaf8dd9955c5bc30f796a2a07ba3321a326612efa99715a230109c9748524cf68778391ca9b16679b51d7
-DIST ccl-1.12.1-linuxx86.tar.gz 20872508 BLAKE2B b8f582334a7a7654666388061c2952a51a2b94dd3885b35e5e938dd3f4bb270db351bb194523d7192611784722a10a8d846290de3aa74c492f00915ef1e327c8 SHA512 7a4ab6bbb11e1ed3a13512f03626d21b6e97ea8e1f4e34647272fab24ea37c8e54b5471f9f20ad1fffacadb9825ec3b79e72fa9d27c426e01eac7bd3601e62c8
DIST ccl-1.12.2-darwinx86.tar.gz 23942873 BLAKE2B 980403852c086c49ed467d391fbcf776b32c9c8cf3352ce71249ccd3cb0548904421ebd20512abef77b888de4a102a0fb19d1117c8a2dd14c3b618feea205f63 SHA512 96ac720ea1f210a89b17ad2a617f55bb04bece3c06bb2433191dab99886a2ad3529716e35624bd4b0d4c9eec2e9ccd80c0d894b75766ac1e361185cd7dfe3e92
DIST ccl-1.12.2-linuxx86.tar.gz 20997426 BLAKE2B 7bc9037b85964be6363f3082af6abf18d519e9a155edd34f4de495aedb5bfec8f43e4403b3b3bcece17c64bb7a381163bbaa03e1d2b9db9aee0a53deef537cf1 SHA512 4cf6960e41347ae980f8ea7366434a016e2a47a9ae090a77e52a2145233454cc97cd4812851d0368024548c46aa0997abb2791992125b5857a9f5f662890338b
DIST ccl.html 962023 BLAKE2B 6dcda62b4d18e83b3b73d554a4dd4255411944831e99464e20c9840f97bccd1bdf74b1d718620b2f6aa5e4f297e1925dbd3da6c48a5977b517caa194f62a37d4 SHA512 536ae7d858846b20bc9cee52292549ff3c2dd28565fcb3a7a1bf706d4f59799e83389d9ea0e73f943f815515c6bc3aa33222d8afde362bc503786b09eb784230
diff --git a/dev-lisp/clozurecl/clozurecl-1.11.5.ebuild b/dev-lisp/clozurecl/clozurecl-1.11.5.ebuild
deleted file mode 100644
index 9856beb63e70..000000000000
--- a/dev-lisp/clozurecl/clozurecl-1.11.5.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic multilib toolchain-funcs vcs-clean
-
-MY_PN=ccl
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Common Lisp implementation, derived from Digitool's MCL product"
-HOMEPAGE="https://ccl.clozure.com"
-SRC_URI="
- x86? ( https://github.com/Clozure/ccl/releases/download/v${PV}/${MY_P}-linuxx86.tar.gz )
- amd64? ( https://github.com/Clozure/ccl/releases/download/v${PV}/${MY_P}-linuxx86.tar.gz )
- arm? ( https://github.com/Clozure/ccl/releases/download/v${PV}/${MY_P}-linuxarm.tar.gz )
- x64-macos? ( https://github.com/Clozure/ccl/releases/download/v${PV}/${MY_P}-darwinx86.tar.gz )
- x64-solaris? ( https://github.com/Clozure/ccl/releases/download/v${PV}/${MY_P}-solarisx86.tar.gz )
- doc? ( https://ccl.clozure.com/docs/ccl.html )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="-* amd64 x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc"
-
-RDEPEND=">=dev-lisp/asdf-2.33-r3:="
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_PN}
-ENVD="${T}/50ccl"
-
-PATCHES=(
- "${FILESDIR}"/${P}-no-pie-32.patch
- "${FILESDIR}"/${P}-fno-common.patch
-)
-
-src_prepare() {
- default
- cp "${EPREFIX}/usr/share/common-lisp/source/asdf/build/asdf.lisp" tools/ || die
-}
-
-src_configure() {
- if use x64-macos; then
- CCL_RUNTIME=dx86cl64; CCL_HEADERS=darwin-x86-headers64; CCL_KERNEL=darwinx8664
- elif use x64-solaris; then
- CCL_RUNTIME=sx86cl64; CCL_HEADERS=solarisx64-headers; CCL_KERNEL=solarisx64
- elif use x86; then
- CCL_RUNTIME=lx86cl; CCL_HEADERS=x86-headers; CCL_KERNEL=linuxx8632
- elif use amd64; then
- CCL_RUNTIME=lx86cl64; CCL_HEADERS=x86-headers64; CCL_KERNEL=linuxx8664
- elif use arm; then
- CCL_RUNTIME=armcl; CCL_HEADERS=arm-headers; CCL_KERNEL=linuxarm
- elif use ppc; then
- CCL_RUNTIME=ppccl; CCL_HEADERS=headers; CCL_KERNEL=linuxppc
- elif use ppc64; then
- CCL_RUNTIME=ppccl64; CCL_HEADERS=headers64; CCL_KERNEL=linuxppc64
- fi
-}
-
-src_compile() {
- emake -C lisp-kernel/${CCL_KERNEL} clean
- emake -C lisp-kernel/${CCL_KERNEL} all CC="$(tc-getCC)"
-
- unset CCL_DEFAULT_DIRECTORY
- ./${CCL_RUNTIME} -n -b -Q -e '(ccl:rebuild-ccl :full t)' -e '(ccl:quit)' || die "Compilation failed"
-
- # remove non-owner write permissions on the full-image
- chmod go-w ${CCL_RUNTIME}{,.image} || die
-
- esvn_clean
-}
-
-src_install() {
- local target_dir="/usr/$(get_libdir)/${PN}"
- local prefix_dir="${EPREFIX}/${target_dir#/}"
-
- mkdir -p "${D}/${prefix_dir#/}"
-
- find . -type f -name '*fsl' -delete || die
- rm -f lisp-kernel/${CCL_KERNEL}/*.o || die
- cp -a compiler level-0 level-1 lib library lisp-kernel scripts \
- tools xdump ${CCL_HEADERS} ${CCL_RUNTIME} ${CCL_RUNTIME}.image \
- "${D}/${prefix_dir#/}" || die
-
- echo "CCL_DEFAULT_DIRECTORY=${prefix_dir}" > "${ENVD}"
- doenvd "${ENVD}"
-
- dosym "${target_dir}/${CCL_RUNTIME}" /usr/bin/ccl
- dodoc doc/release-notes.txt
-
- if use doc ; then
- dodoc "${DISTDIR}/ccl.html"
- dodoc -r doc/manual
- dodoc -r examples
- fi
-}
diff --git a/dev-lisp/clozurecl/clozurecl-1.12.1.ebuild b/dev-lisp/clozurecl/clozurecl-1.12.1.ebuild
deleted file mode 100644
index 544056cacc35..000000000000
--- a/dev-lisp/clozurecl/clozurecl-1.12.1.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic multilib toolchain-funcs vcs-clean
-
-MY_PN=ccl
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Common Lisp implementation, derived from Digitool's MCL product"
-HOMEPAGE="https://ccl.clozure.com"
-SRC_URI="
- x86? ( https://github.com/Clozure/ccl/releases/download/v${PV}/${MY_P}-linuxx86.tar.gz )
- amd64? ( https://github.com/Clozure/ccl/releases/download/v${PV}/${MY_P}-linuxx86.tar.gz )
- x64-macos? ( https://github.com/Clozure/ccl/releases/download/v${PV}/${MY_P}-darwinx86.tar.gz )
- doc? ( https://ccl.clozure.com/docs/ccl.html )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc"
-
-RDEPEND=">=dev-lisp/asdf-2.33-r3:="
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_PN}
-ENVD="${T}/50ccl"
-
-src_prepare() {
- default
- cp "${EPREFIX}/usr/share/common-lisp/source/asdf/build/asdf.lisp" tools/ || die
-}
-
-src_configure() {
- if use x64-macos; then
- CCL_RUNTIME=dx86cl64; CCL_HEADERS=darwin-x86-headers64; CCL_KERNEL=darwinx8664
- elif use x86; then
- CCL_RUNTIME=lx86cl; CCL_HEADERS=x86-headers; CCL_KERNEL=linuxx8632
- elif use amd64; then
- CCL_RUNTIME=lx86cl64; CCL_HEADERS=x86-headers64; CCL_KERNEL=linuxx8664
- fi
-}
-
-src_compile() {
- emake -C lisp-kernel/${CCL_KERNEL} clean
- emake -C lisp-kernel/${CCL_KERNEL} all CC="$(tc-getCC)"
-
- unset CCL_DEFAULT_DIRECTORY
- ./${CCL_RUNTIME} -n -b -Q -e '(ccl:rebuild-ccl :full t)' -e '(ccl:quit)' || die "Compilation failed"
-
- # remove non-owner write permissions on the full-image
- chmod go-w ${CCL_RUNTIME}{,.image} || die
-
- esvn_clean
-}
-
-src_install() {
- local target_dir="/usr/$(get_libdir)/${PN}"
- local prefix_dir="${EPREFIX}/${target_dir#/}"
-
- mkdir -p "${D}/${prefix_dir#/}"
-
- find . -type f -name '*fsl' -delete || die
- rm -f lisp-kernel/${CCL_KERNEL}/*.o || die
- cp -a compiler level-0 level-1 lib library lisp-kernel scripts \
- tools xdump ${CCL_HEADERS} ${CCL_RUNTIME} ${CCL_RUNTIME}.image \
- "${D}/${prefix_dir#/}" || die
-
- echo "CCL_DEFAULT_DIRECTORY=${prefix_dir}" > "${ENVD}"
- doenvd "${ENVD}"
-
- dosym "${target_dir}/${CCL_RUNTIME}" /usr/bin/ccl
- dodoc doc/release-notes.txt
-
- if use doc ; then
- dodoc "${DISTDIR}/ccl.html"
- dodoc -r doc/manual
- dodoc -r examples
- fi
-}
diff --git a/dev-lisp/clozurecl/clozurecl-1.12.ebuild b/dev-lisp/clozurecl/clozurecl-1.12.ebuild
deleted file mode 100644
index 44988803882f..000000000000
--- a/dev-lisp/clozurecl/clozurecl-1.12.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit flag-o-matic multilib toolchain-funcs vcs-clean
-
-MY_PN=ccl
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="Common Lisp implementation, derived from Digitool's MCL product"
-HOMEPAGE="https://ccl.clozure.com"
-SRC_URI="
- x86? ( https://github.com/Clozure/ccl/releases/download/v${PV}/${MY_P}-linuxx86.tar.gz )
- amd64? ( https://github.com/Clozure/ccl/releases/download/v${PV}/${MY_P}-linuxx86.tar.gz )
- x64-macos? ( https://github.com/Clozure/ccl/releases/download/v${PV}/${MY_P}-darwinx86.tar.gz )
- x64-solaris? ( https://github.com/Clozure/ccl/releases/download/v${PV}/${MY_P}-solarisx86.tar.gz )
- doc? ( https://ccl.clozure.com/docs/ccl.html )"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="doc"
-
-RDEPEND=">=dev-lisp/asdf-2.33-r3:="
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${MY_PN}
-ENVD="${T}/50ccl"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.11.5-no-pie-32.patch
- "${FILESDIR}"/${PN}-1.11.5-fno-common.patch
-)
-
-src_prepare() {
- default
- cp "${EPREFIX}/usr/share/common-lisp/source/asdf/build/asdf.lisp" tools/ || die
-}
-
-src_configure() {
- if use x64-macos; then
- CCL_RUNTIME=dx86cl64; CCL_HEADERS=darwin-x86-headers64; CCL_KERNEL=darwinx8664
- elif use x64-solaris; then
- CCL_RUNTIME=sx86cl64; CCL_HEADERS=solarisx64-headers; CCL_KERNEL=solarisx64
- elif use x86; then
- CCL_RUNTIME=lx86cl; CCL_HEADERS=x86-headers; CCL_KERNEL=linuxx8632
- elif use amd64; then
- CCL_RUNTIME=lx86cl64; CCL_HEADERS=x86-headers64; CCL_KERNEL=linuxx8664
- elif use arm; then
- CCL_RUNTIME=armcl; CCL_HEADERS=arm-headers; CCL_KERNEL=linuxarm
- elif use ppc; then
- CCL_RUNTIME=ppccl; CCL_HEADERS=headers; CCL_KERNEL=linuxppc
- elif use ppc64; then
- CCL_RUNTIME=ppccl64; CCL_HEADERS=headers64; CCL_KERNEL=linuxppc64
- fi
-}
-
-src_compile() {
- emake -C lisp-kernel/${CCL_KERNEL} clean
- emake -C lisp-kernel/${CCL_KERNEL} all CC="$(tc-getCC)"
-
- unset CCL_DEFAULT_DIRECTORY
- ./${CCL_RUNTIME} -n -b -Q -e '(ccl:rebuild-ccl :full t)' -e '(ccl:quit)' || die "Compilation failed"
-
- # remove non-owner write permissions on the full-image
- chmod go-w ${CCL_RUNTIME}{,.image} || die
-
- esvn_clean
-}
-
-src_install() {
- local target_dir="/usr/$(get_libdir)/${PN}"
- local prefix_dir="${EPREFIX}/${target_dir#/}"
-
- mkdir -p "${D}/${prefix_dir#/}"
-
- find . -type f -name '*fsl' -delete || die
- rm -f lisp-kernel/${CCL_KERNEL}/*.o || die
- cp -a compiler level-0 level-1 lib library lisp-kernel scripts \
- tools xdump ${CCL_HEADERS} ${CCL_RUNTIME} ${CCL_RUNTIME}.image \
- "${D}/${prefix_dir#/}" || die
-
- echo "CCL_DEFAULT_DIRECTORY=${prefix_dir}" > "${ENVD}"
- doenvd "${ENVD}"
-
- dosym "${target_dir}/${CCL_RUNTIME}" /usr/bin/ccl
- dodoc doc/release-notes.txt
-
- if use doc ; then
- dodoc "${DISTDIR}/ccl.html"
- dodoc -r doc/manual
- dodoc -r examples
- fi
-}
diff --git a/dev-lisp/clozurecl/files/clozurecl-1.11.5-fno-common.patch b/dev-lisp/clozurecl/files/clozurecl-1.11.5-fno-common.patch
deleted file mode 100644
index 3047a3c98b68..000000000000
--- a/dev-lisp/clozurecl/files/clozurecl-1.11.5-fno-common.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-https://bugs.gentoo.org/722618
-Submitted-by: inasprecali@disroot.org
-Author: smuglispweenie@gmail.com
---- a/lisp-kernel/area.h
-+++ b/lisp-kernel/area.h
-@@ -108,7 +108,7 @@ Boolean grow_dynamic_area(natural);
- Boolean shrink_dynamic_area(natural);
-
- /* serialize add_area/remove_area, and also the tcr queue */
--void *tcr_area_lock;
-+extern void *tcr_area_lock;
-
- #define reserved_area ((area *)(all_areas))
- #define active_dynamic_area ((area *)(reserved_area->succ))
---- a/lisp-kernel/gc-common.c
-+++ b/lisp-kernel/gc-common.c
-@@ -92,6 +92,7 @@ LispObj GCarealow = 0, GCareadynamiclow = 0;
- natural GCndnodes_in_area = 0, GCndynamic_dnodes_in_area = 0;
- LispObj GCweakvll = (LispObj)NULL;
- LispObj GCdwsweakvll = (LispObj)NULL;
-+LispObj GCfirstunmarked = (LispObj) NULL;
- LispObj GCephemeral_low = 0;
- natural GCn_ephemeral_dnodes = 0;
- natural GCstack_limit = 0;
---- a/lisp-kernel/gc.h
-+++ b/lisp-kernel/gc.h
-@@ -62,8 +62,8 @@
- extern LispObj GCarealow, GCareadynamiclow;
- extern natural GCndnodes_in_area, GCndynamic_dnodes_in_area;
- extern bitvector GCmarkbits, GCdynamic_markbits,managed_static_refbits,global_refidx,dynamic_refidx,managed_static_refidx;
--LispObj *global_reloctab, *GCrelocptr;
--LispObj GCfirstunmarked;
-+extern LispObj *global_reloctab, *GCrelocptr;
-+extern LispObj GCfirstunmarked;
-
- extern natural lisp_heap_gc_threshold;
- extern natural lisp_heap_notify_threshold;
-@@ -83,7 +83,6 @@ void gc(TCR *, signed_natural);
- int change_hons_area_size(TCR *, signed_natural);
- void delete_protected_area(protected_area_ptr);
- Boolean egc_control(Boolean, BytePtr);
--Boolean free_segments_zero_filled_by_OS;
- Boolean new_heap_segment(ExceptionInformation *, natural, Boolean , TCR *, Boolean *);
- void platform_new_heap_segment(ExceptionInformation *, TCR*, BytePtr, BytePtr);
- /* an type representing 1/4 of a natural word */
-@@ -153,19 +152,19 @@ void report_paging_info_delta(FILE*, paging_info *, paging_info *);
- #define GC_TRAP_FUNCTION_FREEZE 129
- #define GC_TRAP_FUNCTION_THAW 130
-
--Boolean GCDebug, GCverbose, just_purified_p;
--bitvector GCmarkbits, GCdynamic_markbits;
--LispObj GCarealow, GCareadynamiclow;
--natural GCndnodes_in_area, GCndynamic_dnodes_in_area;
--LispObj GCweakvll,GCdwsweakvll;
--LispObj GCephemeral_low;
--natural GCn_ephemeral_dnodes;
--natural GCstack_limit;
-+extern Boolean GCDebug, GCverbose, just_purified_p;
-+extern bitvector GCmarkbits, GCdynamic_markbits;
-+extern LispObj GCarealow, GCareadynamiclow;
-+extern natural GCndnodes_in_area, GCndynamic_dnodes_in_area;
-+extern LispObj GCweakvll, GCdwsweakvll;
-+extern LispObj GCephemeral_low;
-+extern natural GCn_ephemeral_dnodes;
-+extern natural GCstack_limit;
-
- #if WORD_SIZE == 64
--unsigned short *_one_bits;
-+extern unsigned short *_one_bits;
- #else
--const unsigned char _one_bits[256];
-+extern const unsigned char _one_bits[256];
- #endif
-
- #define one_bits(x) _one_bits[x]
-@@ -195,11 +194,10 @@ void gc(TCR *, signed_natural);
- /* backend-interface */
-
- typedef void (*weak_mark_fun) (LispObj);
--weak_mark_fun mark_weak_htabv, dws_mark_weak_htabv;
-+extern weak_mark_fun mark_weak_htabv, dws_mark_weak_htabv;
-
- typedef void (*weak_process_fun)(void);
--
--weak_process_fun markhtabvs;
-+extern weak_process_fun markhtabvs;
-
-
- #define hash_table_vector_header_count (sizeof(hash_table_vector_header)/sizeof(LispObj))
---- a/lisp-kernel/pmcl-kernel.c
-+++ b/lisp-kernel/pmcl-kernel.c
-@@ -151,6 +151,8 @@ wperror(char* message)
-
- LispObj lisp_nil = (LispObj) 0;
- bitvector global_mark_ref_bits = NULL, dynamic_mark_ref_bits = NULL, relocatable_mark_ref_bits = NULL, global_refidx = NULL, dynamic_refidx = NULL,managed_static_refidx = NULL;
-+LispObj *global_reloctab = (LispObj*) 0, *GCrelocptr = (LispObj*) 0;
-+void *tcr_area_lock = NULL;
-
-
- /* These are all "persistent" : they're initialized when
---- a/lisp-kernel/threads.h
-+++ b/lisp-kernel/threads.h
-@@ -187,7 +187,6 @@ void tsd_set(LispObj, void *);
- void *tsd_get(LispObj);
- TCR *new_tcr(natural, natural);
- void thread_init_tcr(TCR *tcr, void *stack_base, natural stack_size);
--TCR *initial_thread_tcr;
-
- #define DEFAULT_THREAD_STACK_SIZE ((size_t) -1)
- #define MINIMAL_THREAD_STACK_SIZE ((size_t) 0)
diff --git a/dev-lisp/clozurecl/files/clozurecl-1.11.5-no-pie-32.patch b/dev-lisp/clozurecl/files/clozurecl-1.11.5-no-pie-32.patch
deleted file mode 100644
index 2396c7a316cf..000000000000
--- a/dev-lisp/clozurecl/files/clozurecl-1.11.5-no-pie-32.patch
+++ /dev/null
@@ -1,7 +0,0 @@
---- a/lisp-kernel/linuxx8632/Makefile
-+++ b/lisp-kernel/linuxx8632/Makefile
-@@ -76,3 +76,3 @@ USE_LINK_SCRIPT = # -T $(LINK_SCRIPT)
- ../../lx86cl: $(KSPOBJ) $(KERNELOBJ) $(DEBUGOBJ) Makefile $(LINK_SCRIPT)
-- $(CC) -m32 $(CDEBUG) -Wl,--export-dynamic $(HASH_STYLE) -o $@ $(USE_LINK_SCRIPT) $(KSPOBJ) $(KERNELOBJ) $(DEBUGOBJ) -Wl,--no-as-needed $(OSLIBS)
-+ $(CC) -m32 $(CDEBUG) -Wl,--export-dynamic $(HASH_STYLE) -no-pie -o $@ $(USE_LINK_SCRIPT) $(KSPOBJ) $(KERNELOBJ) $(DEBUGOBJ) -Wl,--no-as-needed $(OSLIBS)
-
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-09-19 7:32 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-11-21 17:09 [gentoo-commits] repo/gentoo:master commit in: dev-lisp/clozurecl/files/, dev-lisp/clozurecl/ Andrey Grozin
-- strict thread matches above, loose matches on Subject: below --
2023-09-19 7:32 Ulrich Müller
2018-05-18 19:01 José María Alonso
2015-11-22 19:51 Ulrich Müller
2015-11-22 13:37 Ulrich Müller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox