1 |
commit: 3d1ccab4bd419cb1c718834ce307ed707068a464 |
2 |
Author: Chema Alonso Josa <nimiux <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed May 2 21:19:46 2018 +0000 |
4 |
Commit: José María Alonso <nimiux <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed May 2 21:19:46 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/lisp.git/commit/?id=3d1ccab4 |
7 |
|
8 |
dev-lisp/cmucl: Drops old version 20e |
9 |
|
10 |
dev-lisp/cmucl/cmucl-20e.ebuild | 97 ----------------- |
11 |
...20e-customize-lisp-implementation-version.patch | 16 --- |
12 |
dev-lisp/cmucl/files/20e-execstack-fixes.patch | 118 --------------------- |
13 |
3 files changed, 231 deletions(-) |
14 |
|
15 |
diff --git a/dev-lisp/cmucl/cmucl-20e.ebuild b/dev-lisp/cmucl/cmucl-20e.ebuild |
16 |
deleted file mode 100644 |
17 |
index 9e122b9a..00000000 |
18 |
--- a/dev-lisp/cmucl/cmucl-20e.ebuild |
19 |
+++ /dev/null |
20 |
@@ -1,97 +0,0 @@ |
21 |
-# Copyright 1999-2015 Gentoo Foundation |
22 |
-# Distributed under the terms of the GNU General Public License v2 |
23 |
- |
24 |
-EAPI=5 |
25 |
-inherit eutils toolchain-funcs multilib |
26 |
- |
27 |
-MY_PV=${PV:0:3} |
28 |
- |
29 |
-DESCRIPTION="CMU Common Lisp is an implementation of ANSI Common Lisp" |
30 |
-HOMEPAGE="http://www.cons.org/cmucl/" |
31 |
-SRC_URI="http://common-lisp.net/project/cmucl/downloads/release/${MY_PV}/cmucl-src-${MY_PV}.tar.bz2 |
32 |
- http://common-lisp.net/project/cmucl/downloads/release/${MY_PV}/cmucl-${MY_PV}-x86-linux.tar.bz2" |
33 |
- |
34 |
-LICENSE="public-domain" |
35 |
-SLOT="0" |
36 |
-KEYWORDS="x86" |
37 |
-IUSE="X source cpu_flags_x86_sse2" |
38 |
- |
39 |
-CDEPEND=">=dev-lisp/asdf-2.33-r3:= |
40 |
- x11-libs/motif:0" |
41 |
-DEPEND="${CDEPEND} |
42 |
- sys-devel/bc" |
43 |
-RDEPEND="${CDEPEND}" |
44 |
- |
45 |
-S="${WORKDIR}" |
46 |
- |
47 |
-TARGET=linux-4 |
48 |
- |
49 |
-src_prepare() { |
50 |
- epatch "${FILESDIR}"/${MY_PV}-execstack-fixes.patch |
51 |
- epatch "${FILESDIR}"/${MY_PV}-customize-lisp-implementation-version.patch |
52 |
- |
53 |
- cp /usr/share/common-lisp/source/asdf/build/asdf.lisp src/contrib/asdf/ || die |
54 |
-} |
55 |
- |
56 |
-src_compile() { |
57 |
- local cmufpu cmuopts |
58 |
- |
59 |
- if use cpu_flags_x86_sse2; then |
60 |
- cmufpu=sse2 |
61 |
- else |
62 |
- cmufpu=x87 |
63 |
- fi |
64 |
- |
65 |
- if use X; then |
66 |
- cmuopts="-f ${cmufpu}" |
67 |
- else |
68 |
- cmuopts="-u -f ${cmufpu}" |
69 |
- fi |
70 |
- |
71 |
- local buildimage="bin/lisp -core lib/cmucl/lib/lisp-${cmufpu}.core -noinit -nositeinit -batch" |
72 |
- |
73 |
- env CC="$(tc-getCC)" bin/build.sh -v "-gentoo-${PR}" -C "" -o "${buildimage}" ${cmuopts} || die "Cannot build the compiler" |
74 |
- |
75 |
- # Compile up the asdf and defsystem modules |
76 |
- ${TARGET}/lisp/lisp -noinit -nositeinit -batch << EOF || die |
77 |
-(in-package :cl-user) |
78 |
-(setf (ext:search-list "target:") |
79 |
- '("$TARGET/" "src/")) |
80 |
-(setf (ext:search-list "modules:") |
81 |
- '("target:contrib/")) |
82 |
- |
83 |
-(compile-file "modules:asdf/asdf") |
84 |
-(compile-file "modules:defsystem/defsystem") |
85 |
-EOF |
86 |
-} |
87 |
- |
88 |
-src_install() { |
89 |
- env MANDIR=share/man/man1 DOCDIR=share/doc/${PF} \ |
90 |
- bin/make-dist.sh -S -g -G root -O root ${TARGET} ${MY_PV} x86 linux \ |
91 |
- || die "Cannot build installation archive" |
92 |
- # Necessary otherwise tar will fail |
93 |
- dodir /usr |
94 |
- pushd "${D}"/usr > /dev/null |
95 |
- tar xzpf "${WORKDIR}"/cmucl-${MY_PV}-x86-linux.tar.gz \ |
96 |
- || die "Cannot install main system" |
97 |
- if use X ; then |
98 |
- tar xzpf "${WORKDIR}"/cmucl-${MY_PV}-x86-linux.extra.tar.gz \ |
99 |
- || die "Cannot install extra files" |
100 |
- fi |
101 |
- if use source; then |
102 |
- # Necessary otherwise tar will fail |
103 |
- dodir /usr/share/common-lisp/source/${PN} |
104 |
- cd "${D}"/usr/share/common-lisp/source/${PN} |
105 |
- tar --strip-components 1 -xzpf "${WORKDIR}"/cmucl-src-${MY_PV}.tar.gz \ |
106 |
- || die "Cannot install sources" |
107 |
- fi |
108 |
- popd > /dev/null |
109 |
- |
110 |
- # Install site config file |
111 |
- sed "s,@PF@,${PF},g ; s,@VERSION@,$(date +%F),g" \ |
112 |
- < "${FILESDIR}"/site-init.lisp.in \ |
113 |
- > "${D}"/usr/$(get_libdir)/cmucl/site-init.lisp \ |
114 |
- || die "Cannot fix site-init.lisp" |
115 |
- insinto /etc/common-lisp |
116 |
- doins "${FILESDIR}"/cmuclrc || die "Failed to install cmuclrc" |
117 |
-} |
118 |
|
119 |
diff --git a/dev-lisp/cmucl/files/20e-customize-lisp-implementation-version.patch b/dev-lisp/cmucl/files/20e-customize-lisp-implementation-version.patch |
120 |
deleted file mode 100644 |
121 |
index 8fc9278a..00000000 |
122 |
--- a/dev-lisp/cmucl/files/20e-customize-lisp-implementation-version.patch |
123 |
+++ /dev/null |
124 |
@@ -1,16 +0,0 @@ |
125 |
-diff -ur cmucl.orig/src/code/misc.lisp cmucl/src/code/misc.lisp |
126 |
---- cmucl.orig/src/code/misc.lisp 2011-10-25 05:31:39.000000000 +0200 |
127 |
-+++ cmucl/src/code/misc.lisp 2012-01-31 21:46:49.441273068 +0100 |
128 |
-@@ -187,8 +187,10 @@ |
129 |
- |
130 |
- (defun lisp-implementation-version () |
131 |
- "Returns a string describing the implementation version." |
132 |
-- (format nil "~A (~X~A)" *lisp-implementation-version* c:byte-fasl-file-version |
133 |
-- #+unicode _" Unicode" #-unicode "")) |
134 |
-+ (format nil "~X~A~A" |
135 |
-+ c:byte-fasl-file-version |
136 |
-+ #+unicode "-unicode" #-unicode "" |
137 |
-+ *lisp-implementation-version*)) |
138 |
- |
139 |
- (defun machine-instance () |
140 |
- "Returns a string giving the name of the local machine." |
141 |
|
142 |
diff --git a/dev-lisp/cmucl/files/20e-execstack-fixes.patch b/dev-lisp/cmucl/files/20e-execstack-fixes.patch |
143 |
deleted file mode 100644 |
144 |
index 034848d6..00000000 |
145 |
--- a/dev-lisp/cmucl/files/20e-execstack-fixes.patch |
146 |
+++ /dev/null |
147 |
@@ -1,118 +0,0 @@ |
148 |
-diff -Naur work.old/src/lisp/alpha-assem.S work/src/lisp/alpha-assem.S |
149 |
---- work.old/src/lisp/alpha-assem.S 2003-03-06 11:13:09.000000000 -0300 |
150 |
-+++ work/src/lisp/alpha-assem.S 2010-05-10 00:06:34.000000000 -0300 |
151 |
-@@ -297,3 +297,7 @@ |
152 |
- function_end_breakpoint_end: |
153 |
- |
154 |
- |
155 |
-+ |
156 |
-+#if defined(__linux__) && defined(__ELF__) |
157 |
-+.section .note.GNU-stack,"",%progbits |
158 |
-+#endif |
159 |
-diff -Naur work.old/src/lisp/amd64-assem.S work/src/lisp/amd64-assem.S |
160 |
---- work.old/src/lisp/amd64-assem.S 2004-07-27 19:03:53.000000000 -0300 |
161 |
-+++ work/src/lisp/amd64-assem.S 2010-05-10 00:06:34.000000000 -0300 |
162 |
-@@ -1051,3 +1051,7 @@ |
163 |
- .end |
164 |
- |
165 |
- #endif /* LINKAGE_TABLE */ |
166 |
-+ |
167 |
-+#if defined(__linux__) && defined(__ELF__) |
168 |
-+.section .note.GNU-stack,"",%progbits |
169 |
-+#endif |
170 |
-diff -Naur work.old/src/lisp/backtrace.c work/src/lisp/backtrace.c |
171 |
---- work.old/src/lisp/backtrace.c 2009-06-11 13:04:01.000000000 -0300 |
172 |
-+++ work/src/lisp/backtrace.c 2010-05-10 00:06:22.000000000 -0300 |
173 |
-@@ -3,6 +3,8 @@ |
174 |
- * Simple backtrace facility. More or less from Rob's lisp version. |
175 |
- */ |
176 |
- |
177 |
-+#include "os-common.h" |
178 |
-+ |
179 |
- #include <stdio.h> |
180 |
- #include <signal.h> |
181 |
- #include "lisp.h" |
182 |
-diff -Naur work.old/src/lisp/hppa-assem.S work/src/lisp/hppa-assem.S |
183 |
---- work.old/src/lisp/hppa-assem.S 2002-08-23 14:05:35.000000000 -0300 |
184 |
-+++ work/src/lisp/hppa-assem.S 2010-05-10 00:06:34.000000000 -0300 |
185 |
-@@ -460,3 +460,7 @@ |
186 |
- |
187 |
- .export function_end_breakpoint_end |
188 |
- function_end_breakpoint_end |
189 |
-+ |
190 |
-+#if defined(__linux__) && defined(__ELF__) |
191 |
-+.section .note.GNU-stack,"",%progbits |
192 |
-+#endif |
193 |
-diff -Naur work.old/src/lisp/linux-stubs.S work/src/lisp/linux-stubs.S |
194 |
---- work.old/src/lisp/linux-stubs.S 2005-08-17 00:40:16.000000000 -0300 |
195 |
-+++ work/src/lisp/linux-stubs.S 2010-05-10 00:06:34.000000000 -0300 |
196 |
-@@ -995,3 +995,7 @@ |
197 |
- /* doe(yperr_string) */ |
198 |
- /* doe(ypprot_err) */ |
199 |
- #endif /* defined(LINKAGE_TABLE) && !defined(__FreeBSD__) */ |
200 |
-+ |
201 |
-+#if defined(__linux__) && defined(__ELF__) |
202 |
-+.section .note.GNU-stack,"",%progbits |
203 |
-+#endif |
204 |
-diff -Naur work.old/src/lisp/lisp.c work/src/lisp/lisp.c |
205 |
---- work.old/src/lisp/lisp.c 2009-07-13 16:41:54.000000000 -0300 |
206 |
-+++ work/src/lisp/lisp.c 2010-05-10 00:05:55.000000000 -0300 |
207 |
-@@ -5,6 +5,9 @@ |
208 |
- * |
209 |
- */ |
210 |
- |
211 |
-+#include "os-common.h" |
212 |
-+#include <time.h> |
213 |
-+ |
214 |
- #include <stdio.h> |
215 |
- #include <stdlib.h> |
216 |
- #include <limits.h> |
217 |
-diff -Naur work.old/src/lisp/mips-assem.S work/src/lisp/mips-assem.S |
218 |
---- work.old/src/lisp/mips-assem.S 2002-08-23 14:01:02.000000000 -0300 |
219 |
-+++ work/src/lisp/mips-assem.S 2010-05-10 00:06:34.000000000 -0300 |
220 |
-@@ -402,3 +402,7 @@ |
221 |
- move v0, a1 |
222 |
- j _restore_state |
223 |
- .end save_state |
224 |
-+ |
225 |
-+#if defined(__linux__) && defined(__ELF__) |
226 |
-+.section .note.GNU-stack,"",%progbits |
227 |
-+#endif |
228 |
-diff -Naur work.old/src/lisp/os-common.h work/src/lisp/os-common.h |
229 |
---- work.old/src/lisp/os-common.h 1969-12-31 21:00:00.000000000 -0300 |
230 |
-+++ work/src/lisp/os-common.h 2010-05-10 00:06:22.000000000 -0300 |
231 |
-@@ -0,0 +1 @@ |
232 |
-+char* convert_lisp_string(char *c_string, void *lisp_string, int len); |
233 |
-diff -Naur work.old/src/lisp/ppc-assem.S work/src/lisp/ppc-assem.S |
234 |
---- work.old/src/lisp/ppc-assem.S 2006-02-25 01:35:58.000000000 -0300 |
235 |
-+++ work/src/lisp/ppc-assem.S 2010-05-10 00:06:34.000000000 -0300 |
236 |
-@@ -721,3 +721,7 @@ |
237 |
- SET_SIZE(fpu_restore) |
238 |
- |
239 |
- #endif |
240 |
-+ |
241 |
-+#if defined(__linux__) && defined(__ELF__) |
242 |
-+.section .note.GNU-stack,"",%progbits |
243 |
-+#endif |
244 |
-diff -Naur work.old/src/lisp/sparc-assem.S work/src/lisp/sparc-assem.S |
245 |
---- work.old/src/lisp/sparc-assem.S 2003-10-23 23:57:00.000000000 -0300 |
246 |
-+++ work/src/lisp/sparc-assem.S 2010-05-10 00:06:34.000000000 -0300 |
247 |
-@@ -837,3 +837,7 @@ |
248 |
- * End: |
249 |
- */ |
250 |
- |
251 |
-+ |
252 |
-+#if defined(__linux__) && defined(__ELF__) |
253 |
-+.section .note.GNU-stack,"",%progbits |
254 |
-+#endif |
255 |
-diff -Naur work.old/src/lisp/x86-assem.S work/src/lisp/x86-assem.S |
256 |
---- work.old/src/lisp/x86-assem.S 2008-12-24 02:36:40.000000000 -0200 |
257 |
-+++ work/src/lisp/x86-assem.S 2010-05-10 00:06:34.000000000 -0300 |
258 |
-@@ -798,3 +798,7 @@ |
259 |
- ENDFUNC(undefined_foreign_symbol_trap) |
260 |
- |
261 |
- #endif /* LINKAGE_TABLE */ |
262 |
-+ |
263 |
-+#if defined(__linux__) && defined(__ELF__) |
264 |
-+.section .note.GNU-stack,"",%progbits |
265 |
-+#endif |