1 |
commit: 12b1127a7b0490e5df46f39f6020a336bdc84a63 |
2 |
Author: Chema Alonso Josa <nimiux <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon May 28 15:35:18 2018 +0000 |
4 |
Commit: José María Alonso <nimiux <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon May 28 15:35:18 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12b1127a |
7 |
|
8 |
dev-lisp/cmucl: Drop old versions |
9 |
|
10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
11 |
|
12 |
dev-lisp/cmucl/Manifest | 4 - |
13 |
dev-lisp/cmucl/cmucl-20e.ebuild | 97 ----------------- |
14 |
dev-lisp/cmucl/cmucl-21a.ebuild | 92 ---------------- |
15 |
...20e-customize-lisp-implementation-version.patch | 16 --- |
16 |
dev-lisp/cmucl/files/20e-execstack-fixes.patch | 118 --------------------- |
17 |
dev-lisp/cmucl/files/21a-build.patch | 22 ---- |
18 |
...21a-customize-lisp-implementation-version.patch | 16 --- |
19 |
dev-lisp/cmucl/files/21a-execstack-fixes.patch | 118 --------------------- |
20 |
8 files changed, 483 deletions(-) |
21 |
|
22 |
diff --git a/dev-lisp/cmucl/Manifest b/dev-lisp/cmucl/Manifest |
23 |
index 87e8d72e536..cd8cafb0408 100644 |
24 |
--- a/dev-lisp/cmucl/Manifest |
25 |
+++ b/dev-lisp/cmucl/Manifest |
26 |
@@ -1,6 +1,2 @@ |
27 |
-DIST cmucl-20e-x86-linux.tar.bz2 18861880 BLAKE2B ed7b2dec86305ab2ad78ca5a84f0380044211e7cacf67f297c17c26d0a0a344d53c0404d82c86415dd923b92920cbd873436d925417f3590ac3a4c88d919b231 SHA512 1eee852b2a11733d0fac2c046137ccd099370bf208be71becc03710e832510b288768f557e326b1ce95cba16490413142e607fd71346e20e5f8592b51d86b0fe |
28 |
-DIST cmucl-21a-x86-linux.tar.bz2 10870693 BLAKE2B a4fb258cef17eaf281ffd1fdff7f5e953b650c45822ed94722e4df5065b41a53cd0a9f481fba9ac38824dab4952bbb6d45e432b37fe73142c2ead1c8a4b17141 SHA512 7f7d327e47b01dcee1cbb05aae826ef7c64d4d192d7d32d1aba51c8839a06d65942fff5d4c7dbccc955e1e233d2065d83d078266327caee07201e9dce59c39ee |
29 |
DIST cmucl-21c-x86-linux.tar.bz2 11127872 BLAKE2B b9089a40b4a0738f9faccdfddb7b33256a561a07cedc3ef9b3ec7afddbbb9de493c2ffb9af4a8d6b6ce70ef857576870901a6b7a607f52bdaf8a0f53ddd2d07e SHA512 9097220aef612aa3d8367a86a86dc62d86d918190d2688f6e90d415c9f9d881f97f0829e9d310f700b014821d30bf5a15f7a05cdb9201c9deab10a7231e0bcb6 |
30 |
-DIST cmucl-src-20e.tar.bz2 6147575 BLAKE2B a9f31b9a34c513dc88d935e18b9a07854d024d236f1f0294f888c84fd4b781afcd99a3cceac148edd1d1fe6c2dc00c5c8de4069d84b227872e376422275b6984 SHA512 d04f6ac7335572198d37d5df00934edfc82495294446cc5420dada4f2df44009f0983b438d6f10ce5bb02e46fd89df985da5eee3e91a6a75d98e9f86240c0dcc |
31 |
-DIST cmucl-src-21a.tar.bz2 8195492 BLAKE2B 5ca24e1ee258b52b805ab933e80915da6af022d47f8171327e318edb28d9f87c8901fe10ea48d54b6737a808cb03b08f8d3db41688b347971147b991570752cc SHA512 74b077732030dbc3681aadcf9c802fd5b399362c9653b972063e49eb0a2ad528d02d6dde74107210c94c94dc7e9664472c2d072a6ae6f75e7e8c4cf847987e3b |
32 |
DIST cmucl-src-21c.tar.bz2 6947775 BLAKE2B 828075c71ddf459d09076199af4a02f2294063bd9ef0beb6d4bcbb473dd0ff8cfdff7faa9416f640e125603301fa37c73a280db597bf4301c22fbe88c4cc2dbb SHA512 98ea0516b71af7c6f92b5f67f6c1545949fcd1dc95e1238a989c1c2858a75e2751e5eb765b29812ad5cc5de015333787dac2a63a9ddea9bb83cfd72fef6794f4 |
33 |
|
34 |
diff --git a/dev-lisp/cmucl/cmucl-20e.ebuild b/dev-lisp/cmucl/cmucl-20e.ebuild |
35 |
deleted file mode 100644 |
36 |
index 9e122b9a2c9..00000000000 |
37 |
--- a/dev-lisp/cmucl/cmucl-20e.ebuild |
38 |
+++ /dev/null |
39 |
@@ -1,97 +0,0 @@ |
40 |
-# Copyright 1999-2015 Gentoo Foundation |
41 |
-# Distributed under the terms of the GNU General Public License v2 |
42 |
- |
43 |
-EAPI=5 |
44 |
-inherit eutils toolchain-funcs multilib |
45 |
- |
46 |
-MY_PV=${PV:0:3} |
47 |
- |
48 |
-DESCRIPTION="CMU Common Lisp is an implementation of ANSI Common Lisp" |
49 |
-HOMEPAGE="http://www.cons.org/cmucl/" |
50 |
-SRC_URI="http://common-lisp.net/project/cmucl/downloads/release/${MY_PV}/cmucl-src-${MY_PV}.tar.bz2 |
51 |
- http://common-lisp.net/project/cmucl/downloads/release/${MY_PV}/cmucl-${MY_PV}-x86-linux.tar.bz2" |
52 |
- |
53 |
-LICENSE="public-domain" |
54 |
-SLOT="0" |
55 |
-KEYWORDS="x86" |
56 |
-IUSE="X source cpu_flags_x86_sse2" |
57 |
- |
58 |
-CDEPEND=">=dev-lisp/asdf-2.33-r3:= |
59 |
- x11-libs/motif:0" |
60 |
-DEPEND="${CDEPEND} |
61 |
- sys-devel/bc" |
62 |
-RDEPEND="${CDEPEND}" |
63 |
- |
64 |
-S="${WORKDIR}" |
65 |
- |
66 |
-TARGET=linux-4 |
67 |
- |
68 |
-src_prepare() { |
69 |
- epatch "${FILESDIR}"/${MY_PV}-execstack-fixes.patch |
70 |
- epatch "${FILESDIR}"/${MY_PV}-customize-lisp-implementation-version.patch |
71 |
- |
72 |
- cp /usr/share/common-lisp/source/asdf/build/asdf.lisp src/contrib/asdf/ || die |
73 |
-} |
74 |
- |
75 |
-src_compile() { |
76 |
- local cmufpu cmuopts |
77 |
- |
78 |
- if use cpu_flags_x86_sse2; then |
79 |
- cmufpu=sse2 |
80 |
- else |
81 |
- cmufpu=x87 |
82 |
- fi |
83 |
- |
84 |
- if use X; then |
85 |
- cmuopts="-f ${cmufpu}" |
86 |
- else |
87 |
- cmuopts="-u -f ${cmufpu}" |
88 |
- fi |
89 |
- |
90 |
- local buildimage="bin/lisp -core lib/cmucl/lib/lisp-${cmufpu}.core -noinit -nositeinit -batch" |
91 |
- |
92 |
- env CC="$(tc-getCC)" bin/build.sh -v "-gentoo-${PR}" -C "" -o "${buildimage}" ${cmuopts} || die "Cannot build the compiler" |
93 |
- |
94 |
- # Compile up the asdf and defsystem modules |
95 |
- ${TARGET}/lisp/lisp -noinit -nositeinit -batch << EOF || die |
96 |
-(in-package :cl-user) |
97 |
-(setf (ext:search-list "target:") |
98 |
- '("$TARGET/" "src/")) |
99 |
-(setf (ext:search-list "modules:") |
100 |
- '("target:contrib/")) |
101 |
- |
102 |
-(compile-file "modules:asdf/asdf") |
103 |
-(compile-file "modules:defsystem/defsystem") |
104 |
-EOF |
105 |
-} |
106 |
- |
107 |
-src_install() { |
108 |
- env MANDIR=share/man/man1 DOCDIR=share/doc/${PF} \ |
109 |
- bin/make-dist.sh -S -g -G root -O root ${TARGET} ${MY_PV} x86 linux \ |
110 |
- || die "Cannot build installation archive" |
111 |
- # Necessary otherwise tar will fail |
112 |
- dodir /usr |
113 |
- pushd "${D}"/usr > /dev/null |
114 |
- tar xzpf "${WORKDIR}"/cmucl-${MY_PV}-x86-linux.tar.gz \ |
115 |
- || die "Cannot install main system" |
116 |
- if use X ; then |
117 |
- tar xzpf "${WORKDIR}"/cmucl-${MY_PV}-x86-linux.extra.tar.gz \ |
118 |
- || die "Cannot install extra files" |
119 |
- fi |
120 |
- if use source; then |
121 |
- # Necessary otherwise tar will fail |
122 |
- dodir /usr/share/common-lisp/source/${PN} |
123 |
- cd "${D}"/usr/share/common-lisp/source/${PN} |
124 |
- tar --strip-components 1 -xzpf "${WORKDIR}"/cmucl-src-${MY_PV}.tar.gz \ |
125 |
- || die "Cannot install sources" |
126 |
- fi |
127 |
- popd > /dev/null |
128 |
- |
129 |
- # Install site config file |
130 |
- sed "s,@PF@,${PF},g ; s,@VERSION@,$(date +%F),g" \ |
131 |
- < "${FILESDIR}"/site-init.lisp.in \ |
132 |
- > "${D}"/usr/$(get_libdir)/cmucl/site-init.lisp \ |
133 |
- || die "Cannot fix site-init.lisp" |
134 |
- insinto /etc/common-lisp |
135 |
- doins "${FILESDIR}"/cmuclrc || die "Failed to install cmuclrc" |
136 |
-} |
137 |
|
138 |
diff --git a/dev-lisp/cmucl/cmucl-21a.ebuild b/dev-lisp/cmucl/cmucl-21a.ebuild |
139 |
deleted file mode 100644 |
140 |
index f3f9b830b73..00000000000 |
141 |
--- a/dev-lisp/cmucl/cmucl-21a.ebuild |
142 |
+++ /dev/null |
143 |
@@ -1,92 +0,0 @@ |
144 |
-# Copyright 1999-2016 Gentoo Foundation |
145 |
-# Distributed under the terms of the GNU General Public License v2 |
146 |
- |
147 |
-EAPI=5 |
148 |
-inherit eutils toolchain-funcs multilib |
149 |
- |
150 |
-MY_PV=${PV:0:3} |
151 |
- |
152 |
-DESCRIPTION="CMU Common Lisp is an implementation of ANSI Common Lisp" |
153 |
-HOMEPAGE="http://www.cons.org/cmucl/" |
154 |
-SRC_URI="http://common-lisp.net/project/cmucl/downloads/release/${MY_PV}/cmucl-src-${MY_PV}.tar.bz2 |
155 |
- http://common-lisp.net/project/cmucl/downloads/release/${MY_PV}/cmucl-${MY_PV}-x86-linux.tar.bz2" |
156 |
- |
157 |
-LICENSE="public-domain" |
158 |
-SLOT="0" |
159 |
-KEYWORDS="~x86" |
160 |
-IUSE="X source" |
161 |
- |
162 |
-CDEPEND=">=dev-lisp/asdf-2.33-r3:= |
163 |
- x11-libs/motif:0" |
164 |
-DEPEND="${CDEPEND} |
165 |
- sys-devel/bc" |
166 |
-RDEPEND="${CDEPEND}" |
167 |
- |
168 |
-S="${WORKDIR}" |
169 |
- |
170 |
-TARGET=linux-4 |
171 |
- |
172 |
-src_prepare() { |
173 |
- epatch "${FILESDIR}"/${MY_PV}-execstack-fixes.patch |
174 |
- epatch "${FILESDIR}"/${MY_PV}-customize-lisp-implementation-version.patch |
175 |
- epatch "${FILESDIR}"/${MY_PV}-build.patch |
176 |
- |
177 |
- cp /usr/share/common-lisp/source/asdf/build/asdf.lisp src/contrib/asdf/ || die |
178 |
-} |
179 |
- |
180 |
-src_compile() { |
181 |
- local cmuopts buildimage |
182 |
- |
183 |
- if use X; then |
184 |
- cmuopts="" |
185 |
- else |
186 |
- cmuopts="-u" |
187 |
- fi |
188 |
- |
189 |
- buildimage="bin/lisp -batch" |
190 |
- |
191 |
- env CC="$(tc-getCC)" bin/build.sh -v "-gentoo-${PR}" -C "" -o "${buildimage}" ${cmuopts} || die "Cannot build the compiler" |
192 |
- |
193 |
- # Compile up the asdf and defsystem modules |
194 |
- ${TARGET}/lisp/lisp -noinit -nositeinit -batch << EOF || die |
195 |
-(in-package :cl-user) |
196 |
-(setf (ext:search-list "target:") |
197 |
- '("$TARGET/" "src/")) |
198 |
-(setf (ext:search-list "modules:") |
199 |
- '("target:contrib/")) |
200 |
- |
201 |
-(compile-file "modules:asdf/asdf") |
202 |
-(compile-file "modules:defsystem/defsystem") |
203 |
-EOF |
204 |
-} |
205 |
- |
206 |
-src_install() { |
207 |
- env MANDIR=share/man/man1 DOCDIR=share/doc/${PF} \ |
208 |
- bin/make-dist.sh -S -g -G root -O root ${TARGET} ${MY_PV} x86 linux \ |
209 |
- || die "Cannot build installation archive" |
210 |
- # Necessary otherwise tar will fail |
211 |
- dodir /usr |
212 |
- pushd "${D}"/usr > /dev/null |
213 |
- tar xzpf "${WORKDIR}"/cmucl-${MY_PV}-x86-linux.tar.gz \ |
214 |
- || die "Cannot install main system" |
215 |
- if use X ; then |
216 |
- tar xzpf "${WORKDIR}"/cmucl-${MY_PV}-x86-linux.extra.tar.gz \ |
217 |
- || die "Cannot install extra files" |
218 |
- fi |
219 |
- if use source; then |
220 |
- # Necessary otherwise tar will fail |
221 |
- dodir /usr/share/common-lisp/source/${PN} |
222 |
- cd "${D}"/usr/share/common-lisp/source/${PN} |
223 |
- tar --strip-components 1 -xzpf "${WORKDIR}"/cmucl-src-${MY_PV}.tar.gz \ |
224 |
- || die "Cannot install sources" |
225 |
- fi |
226 |
- popd > /dev/null |
227 |
- |
228 |
- # Install site config file |
229 |
- sed "s,@PF@,${PF},g ; s,@VERSION@,$(date +%F),g" \ |
230 |
- < "${FILESDIR}"/site-init.lisp.in \ |
231 |
- > "${D}"/usr/$(get_libdir)/cmucl/site-init.lisp \ |
232 |
- || die "Cannot fix site-init.lisp" |
233 |
- insinto /etc/common-lisp |
234 |
- doins "${FILESDIR}"/cmuclrc || die "Failed to install cmuclrc" |
235 |
-} |
236 |
|
237 |
diff --git a/dev-lisp/cmucl/files/20e-customize-lisp-implementation-version.patch b/dev-lisp/cmucl/files/20e-customize-lisp-implementation-version.patch |
238 |
deleted file mode 100644 |
239 |
index 8fc9278af87..00000000000 |
240 |
--- a/dev-lisp/cmucl/files/20e-customize-lisp-implementation-version.patch |
241 |
+++ /dev/null |
242 |
@@ -1,16 +0,0 @@ |
243 |
-diff -ur cmucl.orig/src/code/misc.lisp cmucl/src/code/misc.lisp |
244 |
---- cmucl.orig/src/code/misc.lisp 2011-10-25 05:31:39.000000000 +0200 |
245 |
-+++ cmucl/src/code/misc.lisp 2012-01-31 21:46:49.441273068 +0100 |
246 |
-@@ -187,8 +187,10 @@ |
247 |
- |
248 |
- (defun lisp-implementation-version () |
249 |
- "Returns a string describing the implementation version." |
250 |
-- (format nil "~A (~X~A)" *lisp-implementation-version* c:byte-fasl-file-version |
251 |
-- #+unicode _" Unicode" #-unicode "")) |
252 |
-+ (format nil "~X~A~A" |
253 |
-+ c:byte-fasl-file-version |
254 |
-+ #+unicode "-unicode" #-unicode "" |
255 |
-+ *lisp-implementation-version*)) |
256 |
- |
257 |
- (defun machine-instance () |
258 |
- "Returns a string giving the name of the local machine." |
259 |
|
260 |
diff --git a/dev-lisp/cmucl/files/20e-execstack-fixes.patch b/dev-lisp/cmucl/files/20e-execstack-fixes.patch |
261 |
deleted file mode 100644 |
262 |
index 034848d64a2..00000000000 |
263 |
--- a/dev-lisp/cmucl/files/20e-execstack-fixes.patch |
264 |
+++ /dev/null |
265 |
@@ -1,118 +0,0 @@ |
266 |
-diff -Naur work.old/src/lisp/alpha-assem.S work/src/lisp/alpha-assem.S |
267 |
---- work.old/src/lisp/alpha-assem.S 2003-03-06 11:13:09.000000000 -0300 |
268 |
-+++ work/src/lisp/alpha-assem.S 2010-05-10 00:06:34.000000000 -0300 |
269 |
-@@ -297,3 +297,7 @@ |
270 |
- function_end_breakpoint_end: |
271 |
- |
272 |
- |
273 |
-+ |
274 |
-+#if defined(__linux__) && defined(__ELF__) |
275 |
-+.section .note.GNU-stack,"",%progbits |
276 |
-+#endif |
277 |
-diff -Naur work.old/src/lisp/amd64-assem.S work/src/lisp/amd64-assem.S |
278 |
---- work.old/src/lisp/amd64-assem.S 2004-07-27 19:03:53.000000000 -0300 |
279 |
-+++ work/src/lisp/amd64-assem.S 2010-05-10 00:06:34.000000000 -0300 |
280 |
-@@ -1051,3 +1051,7 @@ |
281 |
- .end |
282 |
- |
283 |
- #endif /* LINKAGE_TABLE */ |
284 |
-+ |
285 |
-+#if defined(__linux__) && defined(__ELF__) |
286 |
-+.section .note.GNU-stack,"",%progbits |
287 |
-+#endif |
288 |
-diff -Naur work.old/src/lisp/backtrace.c work/src/lisp/backtrace.c |
289 |
---- work.old/src/lisp/backtrace.c 2009-06-11 13:04:01.000000000 -0300 |
290 |
-+++ work/src/lisp/backtrace.c 2010-05-10 00:06:22.000000000 -0300 |
291 |
-@@ -3,6 +3,8 @@ |
292 |
- * Simple backtrace facility. More or less from Rob's lisp version. |
293 |
- */ |
294 |
- |
295 |
-+#include "os-common.h" |
296 |
-+ |
297 |
- #include <stdio.h> |
298 |
- #include <signal.h> |
299 |
- #include "lisp.h" |
300 |
-diff -Naur work.old/src/lisp/hppa-assem.S work/src/lisp/hppa-assem.S |
301 |
---- work.old/src/lisp/hppa-assem.S 2002-08-23 14:05:35.000000000 -0300 |
302 |
-+++ work/src/lisp/hppa-assem.S 2010-05-10 00:06:34.000000000 -0300 |
303 |
-@@ -460,3 +460,7 @@ |
304 |
- |
305 |
- .export function_end_breakpoint_end |
306 |
- function_end_breakpoint_end |
307 |
-+ |
308 |
-+#if defined(__linux__) && defined(__ELF__) |
309 |
-+.section .note.GNU-stack,"",%progbits |
310 |
-+#endif |
311 |
-diff -Naur work.old/src/lisp/linux-stubs.S work/src/lisp/linux-stubs.S |
312 |
---- work.old/src/lisp/linux-stubs.S 2005-08-17 00:40:16.000000000 -0300 |
313 |
-+++ work/src/lisp/linux-stubs.S 2010-05-10 00:06:34.000000000 -0300 |
314 |
-@@ -995,3 +995,7 @@ |
315 |
- /* doe(yperr_string) */ |
316 |
- /* doe(ypprot_err) */ |
317 |
- #endif /* defined(LINKAGE_TABLE) && !defined(__FreeBSD__) */ |
318 |
-+ |
319 |
-+#if defined(__linux__) && defined(__ELF__) |
320 |
-+.section .note.GNU-stack,"",%progbits |
321 |
-+#endif |
322 |
-diff -Naur work.old/src/lisp/lisp.c work/src/lisp/lisp.c |
323 |
---- work.old/src/lisp/lisp.c 2009-07-13 16:41:54.000000000 -0300 |
324 |
-+++ work/src/lisp/lisp.c 2010-05-10 00:05:55.000000000 -0300 |
325 |
-@@ -5,6 +5,9 @@ |
326 |
- * |
327 |
- */ |
328 |
- |
329 |
-+#include "os-common.h" |
330 |
-+#include <time.h> |
331 |
-+ |
332 |
- #include <stdio.h> |
333 |
- #include <stdlib.h> |
334 |
- #include <limits.h> |
335 |
-diff -Naur work.old/src/lisp/mips-assem.S work/src/lisp/mips-assem.S |
336 |
---- work.old/src/lisp/mips-assem.S 2002-08-23 14:01:02.000000000 -0300 |
337 |
-+++ work/src/lisp/mips-assem.S 2010-05-10 00:06:34.000000000 -0300 |
338 |
-@@ -402,3 +402,7 @@ |
339 |
- move v0, a1 |
340 |
- j _restore_state |
341 |
- .end save_state |
342 |
-+ |
343 |
-+#if defined(__linux__) && defined(__ELF__) |
344 |
-+.section .note.GNU-stack,"",%progbits |
345 |
-+#endif |
346 |
-diff -Naur work.old/src/lisp/os-common.h work/src/lisp/os-common.h |
347 |
---- work.old/src/lisp/os-common.h 1969-12-31 21:00:00.000000000 -0300 |
348 |
-+++ work/src/lisp/os-common.h 2010-05-10 00:06:22.000000000 -0300 |
349 |
-@@ -0,0 +1 @@ |
350 |
-+char* convert_lisp_string(char *c_string, void *lisp_string, int len); |
351 |
-diff -Naur work.old/src/lisp/ppc-assem.S work/src/lisp/ppc-assem.S |
352 |
---- work.old/src/lisp/ppc-assem.S 2006-02-25 01:35:58.000000000 -0300 |
353 |
-+++ work/src/lisp/ppc-assem.S 2010-05-10 00:06:34.000000000 -0300 |
354 |
-@@ -721,3 +721,7 @@ |
355 |
- SET_SIZE(fpu_restore) |
356 |
- |
357 |
- #endif |
358 |
-+ |
359 |
-+#if defined(__linux__) && defined(__ELF__) |
360 |
-+.section .note.GNU-stack,"",%progbits |
361 |
-+#endif |
362 |
-diff -Naur work.old/src/lisp/sparc-assem.S work/src/lisp/sparc-assem.S |
363 |
---- work.old/src/lisp/sparc-assem.S 2003-10-23 23:57:00.000000000 -0300 |
364 |
-+++ work/src/lisp/sparc-assem.S 2010-05-10 00:06:34.000000000 -0300 |
365 |
-@@ -837,3 +837,7 @@ |
366 |
- * End: |
367 |
- */ |
368 |
- |
369 |
-+ |
370 |
-+#if defined(__linux__) && defined(__ELF__) |
371 |
-+.section .note.GNU-stack,"",%progbits |
372 |
-+#endif |
373 |
-diff -Naur work.old/src/lisp/x86-assem.S work/src/lisp/x86-assem.S |
374 |
---- work.old/src/lisp/x86-assem.S 2008-12-24 02:36:40.000000000 -0200 |
375 |
-+++ work/src/lisp/x86-assem.S 2010-05-10 00:06:34.000000000 -0300 |
376 |
-@@ -798,3 +798,7 @@ |
377 |
- ENDFUNC(undefined_foreign_symbol_trap) |
378 |
- |
379 |
- #endif /* LINKAGE_TABLE */ |
380 |
-+ |
381 |
-+#if defined(__linux__) && defined(__ELF__) |
382 |
-+.section .note.GNU-stack,"",%progbits |
383 |
-+#endif |
384 |
|
385 |
diff --git a/dev-lisp/cmucl/files/21a-build.patch b/dev-lisp/cmucl/files/21a-build.patch |
386 |
deleted file mode 100644 |
387 |
index 464234109b3..00000000000 |
388 |
--- a/dev-lisp/cmucl/files/21a-build.patch |
389 |
+++ /dev/null |
390 |
@@ -1,22 +0,0 @@ |
391 |
-diff -r -U2 21a.orig/bin/build.sh 21a/bin/build.sh |
392 |
---- 21a.orig/bin/build.sh 2015-05-19 07:42:40.000000000 +0600 |
393 |
-+++ 21a/bin/build.sh 2016-04-03 20:54:08.597016537 +0600 |
394 |
-@@ -40,5 +40,5 @@ |
395 |
- ENABLE4="yes" |
396 |
- |
397 |
--version=20f |
398 |
-+version=21a |
399 |
- SRCDIR=src |
400 |
- BINDIR=bin |
401 |
-@@ -145,10 +145,9 @@ |
402 |
- $TOOLDIR/load-world.sh $TARGET "$VERSION" || { echo "Failed: $TOOLDIR/load-world.sh"; exit 1; } |
403 |
- |
404 |
-- $TARGET/lisp/lisp -batch -noinit -nositeinit $FPU_MODE < /dev/null || { echo "Failed: $TARGET/lisp/lisp -batch -noinit $FPU_MODE"; exit 1; } |
405 |
-+ $TARGET/lisp/lisp -batch -noinit -nositeinit < /dev/null || { echo "Failed: $TARGET/lisp/lisp -batch -noinit"; exit 1; } |
406 |
- return 0; |
407 |
- fi |
408 |
- } |
409 |
- |
410 |
--FPU_MODE= |
411 |
- BUILDWORLD="$TOOLDIR/build-world.sh" |
412 |
- BUILD_POT="yes" |
413 |
|
414 |
diff --git a/dev-lisp/cmucl/files/21a-customize-lisp-implementation-version.patch b/dev-lisp/cmucl/files/21a-customize-lisp-implementation-version.patch |
415 |
deleted file mode 100644 |
416 |
index 8fc9278af87..00000000000 |
417 |
--- a/dev-lisp/cmucl/files/21a-customize-lisp-implementation-version.patch |
418 |
+++ /dev/null |
419 |
@@ -1,16 +0,0 @@ |
420 |
-diff -ur cmucl.orig/src/code/misc.lisp cmucl/src/code/misc.lisp |
421 |
---- cmucl.orig/src/code/misc.lisp 2011-10-25 05:31:39.000000000 +0200 |
422 |
-+++ cmucl/src/code/misc.lisp 2012-01-31 21:46:49.441273068 +0100 |
423 |
-@@ -187,8 +187,10 @@ |
424 |
- |
425 |
- (defun lisp-implementation-version () |
426 |
- "Returns a string describing the implementation version." |
427 |
-- (format nil "~A (~X~A)" *lisp-implementation-version* c:byte-fasl-file-version |
428 |
-- #+unicode _" Unicode" #-unicode "")) |
429 |
-+ (format nil "~X~A~A" |
430 |
-+ c:byte-fasl-file-version |
431 |
-+ #+unicode "-unicode" #-unicode "" |
432 |
-+ *lisp-implementation-version*)) |
433 |
- |
434 |
- (defun machine-instance () |
435 |
- "Returns a string giving the name of the local machine." |
436 |
|
437 |
diff --git a/dev-lisp/cmucl/files/21a-execstack-fixes.patch b/dev-lisp/cmucl/files/21a-execstack-fixes.patch |
438 |
deleted file mode 100644 |
439 |
index 034848d64a2..00000000000 |
440 |
--- a/dev-lisp/cmucl/files/21a-execstack-fixes.patch |
441 |
+++ /dev/null |
442 |
@@ -1,118 +0,0 @@ |
443 |
-diff -Naur work.old/src/lisp/alpha-assem.S work/src/lisp/alpha-assem.S |
444 |
---- work.old/src/lisp/alpha-assem.S 2003-03-06 11:13:09.000000000 -0300 |
445 |
-+++ work/src/lisp/alpha-assem.S 2010-05-10 00:06:34.000000000 -0300 |
446 |
-@@ -297,3 +297,7 @@ |
447 |
- function_end_breakpoint_end: |
448 |
- |
449 |
- |
450 |
-+ |
451 |
-+#if defined(__linux__) && defined(__ELF__) |
452 |
-+.section .note.GNU-stack,"",%progbits |
453 |
-+#endif |
454 |
-diff -Naur work.old/src/lisp/amd64-assem.S work/src/lisp/amd64-assem.S |
455 |
---- work.old/src/lisp/amd64-assem.S 2004-07-27 19:03:53.000000000 -0300 |
456 |
-+++ work/src/lisp/amd64-assem.S 2010-05-10 00:06:34.000000000 -0300 |
457 |
-@@ -1051,3 +1051,7 @@ |
458 |
- .end |
459 |
- |
460 |
- #endif /* LINKAGE_TABLE */ |
461 |
-+ |
462 |
-+#if defined(__linux__) && defined(__ELF__) |
463 |
-+.section .note.GNU-stack,"",%progbits |
464 |
-+#endif |
465 |
-diff -Naur work.old/src/lisp/backtrace.c work/src/lisp/backtrace.c |
466 |
---- work.old/src/lisp/backtrace.c 2009-06-11 13:04:01.000000000 -0300 |
467 |
-+++ work/src/lisp/backtrace.c 2010-05-10 00:06:22.000000000 -0300 |
468 |
-@@ -3,6 +3,8 @@ |
469 |
- * Simple backtrace facility. More or less from Rob's lisp version. |
470 |
- */ |
471 |
- |
472 |
-+#include "os-common.h" |
473 |
-+ |
474 |
- #include <stdio.h> |
475 |
- #include <signal.h> |
476 |
- #include "lisp.h" |
477 |
-diff -Naur work.old/src/lisp/hppa-assem.S work/src/lisp/hppa-assem.S |
478 |
---- work.old/src/lisp/hppa-assem.S 2002-08-23 14:05:35.000000000 -0300 |
479 |
-+++ work/src/lisp/hppa-assem.S 2010-05-10 00:06:34.000000000 -0300 |
480 |
-@@ -460,3 +460,7 @@ |
481 |
- |
482 |
- .export function_end_breakpoint_end |
483 |
- function_end_breakpoint_end |
484 |
-+ |
485 |
-+#if defined(__linux__) && defined(__ELF__) |
486 |
-+.section .note.GNU-stack,"",%progbits |
487 |
-+#endif |
488 |
-diff -Naur work.old/src/lisp/linux-stubs.S work/src/lisp/linux-stubs.S |
489 |
---- work.old/src/lisp/linux-stubs.S 2005-08-17 00:40:16.000000000 -0300 |
490 |
-+++ work/src/lisp/linux-stubs.S 2010-05-10 00:06:34.000000000 -0300 |
491 |
-@@ -995,3 +995,7 @@ |
492 |
- /* doe(yperr_string) */ |
493 |
- /* doe(ypprot_err) */ |
494 |
- #endif /* defined(LINKAGE_TABLE) && !defined(__FreeBSD__) */ |
495 |
-+ |
496 |
-+#if defined(__linux__) && defined(__ELF__) |
497 |
-+.section .note.GNU-stack,"",%progbits |
498 |
-+#endif |
499 |
-diff -Naur work.old/src/lisp/lisp.c work/src/lisp/lisp.c |
500 |
---- work.old/src/lisp/lisp.c 2009-07-13 16:41:54.000000000 -0300 |
501 |
-+++ work/src/lisp/lisp.c 2010-05-10 00:05:55.000000000 -0300 |
502 |
-@@ -5,6 +5,9 @@ |
503 |
- * |
504 |
- */ |
505 |
- |
506 |
-+#include "os-common.h" |
507 |
-+#include <time.h> |
508 |
-+ |
509 |
- #include <stdio.h> |
510 |
- #include <stdlib.h> |
511 |
- #include <limits.h> |
512 |
-diff -Naur work.old/src/lisp/mips-assem.S work/src/lisp/mips-assem.S |
513 |
---- work.old/src/lisp/mips-assem.S 2002-08-23 14:01:02.000000000 -0300 |
514 |
-+++ work/src/lisp/mips-assem.S 2010-05-10 00:06:34.000000000 -0300 |
515 |
-@@ -402,3 +402,7 @@ |
516 |
- move v0, a1 |
517 |
- j _restore_state |
518 |
- .end save_state |
519 |
-+ |
520 |
-+#if defined(__linux__) && defined(__ELF__) |
521 |
-+.section .note.GNU-stack,"",%progbits |
522 |
-+#endif |
523 |
-diff -Naur work.old/src/lisp/os-common.h work/src/lisp/os-common.h |
524 |
---- work.old/src/lisp/os-common.h 1969-12-31 21:00:00.000000000 -0300 |
525 |
-+++ work/src/lisp/os-common.h 2010-05-10 00:06:22.000000000 -0300 |
526 |
-@@ -0,0 +1 @@ |
527 |
-+char* convert_lisp_string(char *c_string, void *lisp_string, int len); |
528 |
-diff -Naur work.old/src/lisp/ppc-assem.S work/src/lisp/ppc-assem.S |
529 |
---- work.old/src/lisp/ppc-assem.S 2006-02-25 01:35:58.000000000 -0300 |
530 |
-+++ work/src/lisp/ppc-assem.S 2010-05-10 00:06:34.000000000 -0300 |
531 |
-@@ -721,3 +721,7 @@ |
532 |
- SET_SIZE(fpu_restore) |
533 |
- |
534 |
- #endif |
535 |
-+ |
536 |
-+#if defined(__linux__) && defined(__ELF__) |
537 |
-+.section .note.GNU-stack,"",%progbits |
538 |
-+#endif |
539 |
-diff -Naur work.old/src/lisp/sparc-assem.S work/src/lisp/sparc-assem.S |
540 |
---- work.old/src/lisp/sparc-assem.S 2003-10-23 23:57:00.000000000 -0300 |
541 |
-+++ work/src/lisp/sparc-assem.S 2010-05-10 00:06:34.000000000 -0300 |
542 |
-@@ -837,3 +837,7 @@ |
543 |
- * End: |
544 |
- */ |
545 |
- |
546 |
-+ |
547 |
-+#if defined(__linux__) && defined(__ELF__) |
548 |
-+.section .note.GNU-stack,"",%progbits |
549 |
-+#endif |
550 |
-diff -Naur work.old/src/lisp/x86-assem.S work/src/lisp/x86-assem.S |
551 |
---- work.old/src/lisp/x86-assem.S 2008-12-24 02:36:40.000000000 -0200 |
552 |
-+++ work/src/lisp/x86-assem.S 2010-05-10 00:06:34.000000000 -0300 |
553 |
-@@ -798,3 +798,7 @@ |
554 |
- ENDFUNC(undefined_foreign_symbol_trap) |
555 |
- |
556 |
- #endif /* LINKAGE_TABLE */ |
557 |
-+ |
558 |
-+#if defined(__linux__) && defined(__ELF__) |
559 |
-+.section .note.GNU-stack,"",%progbits |
560 |
-+#endif |