public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/lisp:master commit in: dev-lisp/cmucl/files/, dev-lisp/cmucl/
@ 2011-06-21 12:03 Stelian Ionescu
  0 siblings, 0 replies; 6+ messages in thread
From: Stelian Ionescu @ 2011-06-21 12:03 UTC (permalink / raw
  To: gentoo-commits

commit:     e989f52e3b453ddd8c25a85576a17601b2440248
Author:     Stelian Ionescu <sionescu <AT> cddr <DOT> org>
AuthorDate: Tue Jun 21 11:11:25 2011 +0000
Commit:     Stelian Ionescu <sionescu <AT> cddr <DOT> org>
CommitDate: Tue Jun 21 11:11:25 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/lisp.git;a=commit;h=e989f52e

dev-lisp/cmucl: use gentoo-init-1.0 and ASDF2, bump to 20b_p001-r1

---
 ...cl-20b_p001.ebuild => cmucl-20b_p001-r1.ebuild} |   22 +++++++++++++------
 dev-lisp/cmucl/files/cmuclrc                       |    4 ---
 dev-lisp/cmucl/files/site-init.lisp.in             |    9 ++++---
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/dev-lisp/cmucl/cmucl-20b_p001.ebuild b/dev-lisp/cmucl/cmucl-20b_p001-r1.ebuild
similarity index 85%
rename from dev-lisp/cmucl/cmucl-20b_p001.ebuild
rename to dev-lisp/cmucl/cmucl-20b_p001-r1.ebuild
index 6b90075..21cec42 100644
--- a/dev-lisp/cmucl/cmucl-20b_p001.ebuild
+++ b/dev-lisp/cmucl/cmucl-20b_p001-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -16,12 +16,13 @@ RESTRICT="mirror"
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE="X source sse2"
+IUSE="+asdf X source sse2"
 
-RDEPEND="x11-libs/openmotif"
-DEPEND="${RDEPEND}
+DEPEND="x11-libs/openmotif
 		sys-devel/bc"
-PDEPEND="dev-lisp/gentoo-init"
+
+RDEPEND="x11-libs/openmotif
+		asdf? ( >=dev-lisp/gentoo-init-1.0 )"
 
 S="${WORKDIR}"
 
@@ -67,6 +68,13 @@ src_install() {
 		< "${FILESDIR}"/site-init.lisp.in \
 		> "${D}"/usr/$(get_libdir)/cmucl/site-init.lisp \
 		|| die "Cannot fix site-init.lisp"
-	insinto /etc
-	doins "${FILESDIR}"/cmuclrc || die "Failed to install cmuclrc"
+	cp "${FILESDIR}"/cmuclrc .
+	if use asdf; then
+		cat >> cmuclrc <<EOF
+;;; Setup ASDF2
+(load "/etc/common-lisp/gentoo-init.lisp")
+EOF
+	fi
+	insinto /etc/common-lisp
+	doins cmuclrc || die "Failed to install cmuclrc"
 }

diff --git a/dev-lisp/cmucl/files/cmuclrc b/dev-lisp/cmucl/files/cmuclrc
index e663e92..ecdad5a 100644
--- a/dev-lisp/cmucl/files/cmuclrc
+++ b/dev-lisp/cmucl/files/cmuclrc
@@ -3,7 +3,3 @@
 
 (in-package :common-lisp-user)
 
-(if (probe-file "/etc/gentoo-init.lisp")
-	(load "/etc/gentoo-init.lisp")
-  (format t "~%;;; Warning: There is no /etc/gentoo-init.lisp file ~
-\(which should be provided by dev-lisp/gentoo-init"))

diff --git a/dev-lisp/cmucl/files/site-init.lisp.in b/dev-lisp/cmucl/files/site-init.lisp.in
index 1b23216..bd09645 100644
--- a/dev-lisp/cmucl/files/site-init.lisp.in
+++ b/dev-lisp/cmucl/files/site-init.lisp.in
@@ -7,14 +7,15 @@
 
 ;;; Heavy modifications by Peter Van Eynde
 
-;;; More modifications for Gentoo by Matthew Kennedy
+;;; More modifications for Gentoo by Matthew Kennedy and Stelian Ionescu
 ;;; <mkennedy@gentoo.org>
 
 (in-package "SYSTEM")
 
-(if (probe-file "/etc/cmuclrc")
-    (load "/etc/cmuclrc")
-  (format t "~%;;; Warning: There is no /etc/cmuclrc file (which should have been created during emerge"))
+(if (probe-file "/etc/common-lisp/cmuclrc")
+    (load "/etc/common-lisp/cmuclrc")
+  (format t "~%;;; Warning: There is no /etc/common-lisp/cmuclrc file 
+\(which should have been created during emerge"))
 
 ;;; If you have sources installed on your system, un-comment the following form
 ;;; and change it to point to the source location.  This will allow the Hemlock



^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/lisp:master commit in: dev-lisp/cmucl/files/, dev-lisp/cmucl/
@ 2012-01-31 21:24 Stelian Ionescu
  0 siblings, 0 replies; 6+ messages in thread
From: Stelian Ionescu @ 2012-01-31 21:24 UTC (permalink / raw
  To: gentoo-commits

commit:     e0ddf5996f6305d30cb8535637ee97f313ea6428
Author:     Stelian Ionescu <sionescu <AT> cddr <DOT> org>
AuthorDate: Tue Jan 31 21:13:31 2012 +0000
Commit:     Stelian Ionescu <sionescu <AT> cddr <DOT> org>
CommitDate: Tue Jan 31 21:13:31 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/lisp.git;a=commit;h=e0ddf599

dev-lisp/cmucl: bump to version 20c

---
 dev-lisp/cmucl/cmucl-20c.ebuild                    |   77 +++++++++++++
 ...20c-customize-lisp-implementation-version.patch |   16 +++
 dev-lisp/cmucl/files/20c-execstack-fixes.patch     |  118 ++++++++++++++++++++
 3 files changed, 211 insertions(+), 0 deletions(-)

diff --git a/dev-lisp/cmucl/cmucl-20c.ebuild b/dev-lisp/cmucl/cmucl-20c.ebuild
new file mode 100644
index 0000000..84f5de6
--- /dev/null
+++ b/dev-lisp/cmucl/cmucl-20c.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=3
+inherit eutils glo-utils toolchain-funcs
+
+MY_PV=${PV:0:3}
+
+DESCRIPTION="CMU Common Lisp is an implementation of ANSI Common Lisp"
+HOMEPAGE="http://www.cons.org/cmucl/"
+SRC_URI="http://common-lisp.net/project/cmucl/downloads/release/${MY_PV}/cmucl-src-${MY_PV}.tar.bz2
+	http://common-lisp.net/project/cmucl/downloads/release/${MY_PV}/cmucl-${MY_PV}-x86-linux.tar.bz2"
+RESTRICT="mirror"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="+asdf X source sse2"
+
+DEPEND="x11-libs/openmotif
+		sys-devel/bc"
+
+RDEPEND="x11-libs/openmotif
+		asdf? ( >=dev-lisp/gentoo-init-1.0 )"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${MY_PV}-execstack-fixes.patch
+	epatch "${FILESDIR}"/${MY_PV}-customize-lisp-implementation-version.patch
+}
+
+src_compile() {
+	local cmufpu=$(glo_usev sse2 sse2 x87)
+	local cmuopts="$(glo_usev !X -u) -f ${cmufpu}"
+	local buildimage="bin/lisp -core lib/cmucl/lib/lisp-${cmufpu}.core -noinit -nositeinit -batch"
+	env CC="$(tc-getCC)" src/tools/build.sh -v "-gentoo-${PR}" -C "" -o "${buildimage}" ${cmuopts} || die "Cannot build the compiler"
+}
+
+src_install() {
+	env MANDIR=share/man/man1 DOCDIR=share/doc/${PF} \
+		src/tools/make-dist.sh -S -g -G root -O root build-4 ${MY_PV} x86 linux \
+		|| die "Cannot build installation archive"
+	# Necessary otherwise tar will fail
+	dodir /usr
+	pushd "${D}"/usr
+	tar xzpf "${WORKDIR}"/cmucl-${MY_PV}-x86-linux.tar.gz \
+		|| die "Cannot install main system"
+	if use X ; then
+		tar xzpf "${WORKDIR}"/cmucl-${MY_PV}-x86-linux.extra.tar.gz \
+			|| die "Cannot install extra files"
+	fi
+	if use source; then
+		# Necessary otherwise tar will fail
+		dodir /usr/share/common-lisp/source/${PN}
+		cd "${D}"/usr/share/common-lisp/source/${PN}
+		tar --strip-components 1 -xzpf "${WORKDIR}"/cmucl-src-${MY_PV}.tar.gz \
+			|| die "Cannot install sources"
+	fi
+	popd
+
+	# Install site config file
+	sed "s,@PF@,${PF},g ; s,@VERSION@,$(date +%F),g" \
+		< "${FILESDIR}"/site-init.lisp.in \
+		> "${D}"/usr/$(get_libdir)/cmucl/site-init.lisp \
+		|| die "Cannot fix site-init.lisp"
+	cp "${FILESDIR}"/cmuclrc .
+	if use asdf; then
+		cat >> cmuclrc <<EOF
+;;; Setup ASDF2
+(load "/etc/common-lisp/gentoo-init.lisp")
+EOF
+	fi
+	insinto /etc/common-lisp
+	doins cmuclrc || die "Failed to install cmuclrc"
+}

diff --git a/dev-lisp/cmucl/files/20c-customize-lisp-implementation-version.patch b/dev-lisp/cmucl/files/20c-customize-lisp-implementation-version.patch
new file mode 100644
index 0000000..8fc9278
--- /dev/null
+++ b/dev-lisp/cmucl/files/20c-customize-lisp-implementation-version.patch
@@ -0,0 +1,16 @@
+diff -ur cmucl.orig/src/code/misc.lisp cmucl/src/code/misc.lisp
+--- cmucl.orig/src/code/misc.lisp	2011-10-25 05:31:39.000000000 +0200
++++ cmucl/src/code/misc.lisp	2012-01-31 21:46:49.441273068 +0100
+@@ -187,8 +187,10 @@
+ 
+ (defun lisp-implementation-version ()
+   "Returns a string describing the implementation version."
+-  (format nil "~A (~X~A)" *lisp-implementation-version* c:byte-fasl-file-version
+-	  #+unicode _" Unicode" #-unicode ""))
++  (format nil "~X~A~A"
++          c:byte-fasl-file-version
++          #+unicode "-unicode" #-unicode ""
++          *lisp-implementation-version*))
+ 
+ (defun machine-instance ()
+   "Returns a string giving the name of the local machine."

diff --git a/dev-lisp/cmucl/files/20c-execstack-fixes.patch b/dev-lisp/cmucl/files/20c-execstack-fixes.patch
new file mode 100644
index 0000000..034848d
--- /dev/null
+++ b/dev-lisp/cmucl/files/20c-execstack-fixes.patch
@@ -0,0 +1,118 @@
+diff -Naur work.old/src/lisp/alpha-assem.S work/src/lisp/alpha-assem.S
+--- work.old/src/lisp/alpha-assem.S	2003-03-06 11:13:09.000000000 -0300
++++ work/src/lisp/alpha-assem.S	2010-05-10 00:06:34.000000000 -0300
+@@ -297,3 +297,7 @@
+ function_end_breakpoint_end:
+ 
+ 
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+diff -Naur work.old/src/lisp/amd64-assem.S work/src/lisp/amd64-assem.S
+--- work.old/src/lisp/amd64-assem.S	2004-07-27 19:03:53.000000000 -0300
++++ work/src/lisp/amd64-assem.S	2010-05-10 00:06:34.000000000 -0300
+@@ -1051,3 +1051,7 @@
+ 	.end
+ 
+ #endif /* LINKAGE_TABLE */
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+diff -Naur work.old/src/lisp/backtrace.c work/src/lisp/backtrace.c
+--- work.old/src/lisp/backtrace.c	2009-06-11 13:04:01.000000000 -0300
++++ work/src/lisp/backtrace.c	2010-05-10 00:06:22.000000000 -0300
+@@ -3,6 +3,8 @@
+  * Simple backtrace facility.  More or less from Rob's lisp version.
+  */
+ 
++#include "os-common.h"
++
+ #include <stdio.h>
+ #include <signal.h>
+ #include "lisp.h"
+diff -Naur work.old/src/lisp/hppa-assem.S work/src/lisp/hppa-assem.S
+--- work.old/src/lisp/hppa-assem.S	2002-08-23 14:05:35.000000000 -0300
++++ work/src/lisp/hppa-assem.S	2010-05-10 00:06:34.000000000 -0300
+@@ -460,3 +460,7 @@
+ 
+ 	.export	function_end_breakpoint_end
+ function_end_breakpoint_end
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+diff -Naur work.old/src/lisp/linux-stubs.S work/src/lisp/linux-stubs.S
+--- work.old/src/lisp/linux-stubs.S	2005-08-17 00:40:16.000000000 -0300
++++ work/src/lisp/linux-stubs.S	2010-05-10 00:06:34.000000000 -0300
+@@ -995,3 +995,7 @@
+ /*  doe(yperr_string) */
+ /*  doe(ypprot_err) */
+ #endif /* defined(LINKAGE_TABLE) && !defined(__FreeBSD__) */
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+diff -Naur work.old/src/lisp/lisp.c work/src/lisp/lisp.c
+--- work.old/src/lisp/lisp.c	2009-07-13 16:41:54.000000000 -0300
++++ work/src/lisp/lisp.c	2010-05-10 00:05:55.000000000 -0300
+@@ -5,6 +5,9 @@
+  *
+  */
+ 
++#include "os-common.h"
++#include <time.h>
++
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <limits.h>
+diff -Naur work.old/src/lisp/mips-assem.S work/src/lisp/mips-assem.S
+--- work.old/src/lisp/mips-assem.S	2002-08-23 14:01:02.000000000 -0300
++++ work/src/lisp/mips-assem.S	2010-05-10 00:06:34.000000000 -0300
+@@ -402,3 +402,7 @@
+ 	move	v0, a1
+ 	j	_restore_state
+ 	.end	save_state
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+diff -Naur work.old/src/lisp/os-common.h work/src/lisp/os-common.h
+--- work.old/src/lisp/os-common.h	1969-12-31 21:00:00.000000000 -0300
++++ work/src/lisp/os-common.h	2010-05-10 00:06:22.000000000 -0300
+@@ -0,0 +1 @@
++char* convert_lisp_string(char *c_string, void *lisp_string, int len);
+diff -Naur work.old/src/lisp/ppc-assem.S work/src/lisp/ppc-assem.S
+--- work.old/src/lisp/ppc-assem.S	2006-02-25 01:35:58.000000000 -0300
++++ work/src/lisp/ppc-assem.S	2010-05-10 00:06:34.000000000 -0300
+@@ -721,3 +721,7 @@
+ 	SET_SIZE(fpu_restore)
+ 	
+ #endif
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+diff -Naur work.old/src/lisp/sparc-assem.S work/src/lisp/sparc-assem.S
+--- work.old/src/lisp/sparc-assem.S	2003-10-23 23:57:00.000000000 -0300
++++ work/src/lisp/sparc-assem.S	2010-05-10 00:06:34.000000000 -0300
+@@ -837,3 +837,7 @@
+  * End:
+  */						
+ 		
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+diff -Naur work.old/src/lisp/x86-assem.S work/src/lisp/x86-assem.S
+--- work.old/src/lisp/x86-assem.S	2008-12-24 02:36:40.000000000 -0200
++++ work/src/lisp/x86-assem.S	2010-05-10 00:06:34.000000000 -0300
+@@ -798,3 +798,7 @@
+ ENDFUNC(undefined_foreign_symbol_trap)
+ 
+ #endif /* LINKAGE_TABLE */
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif



^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/lisp:master commit in: dev-lisp/cmucl/files/, dev-lisp/cmucl/
@ 2013-04-04 18:23 Stelian Ionescu
  0 siblings, 0 replies; 6+ messages in thread
From: Stelian Ionescu @ 2013-04-04 18:23 UTC (permalink / raw
  To: gentoo-commits

commit:     bdf24d1bd5e7ff56340103e01c9a09a7ae135873
Author:     Stelian Ionescu <sionescu <AT> cddr <DOT> org>
AuthorDate: Thu Apr  4 15:59:59 2013 +0000
Commit:     Stelian Ionescu <sionescu <AT> cddr <DOT> org>
CommitDate: Thu Apr  4 15:59:59 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/lisp.git;a=commit;h=bdf24d1b

dev-lisp/cmucl: bump to 20d

---
 dev-lisp/cmucl/cmucl-20b_p001-r1.ebuild            |   80 -------------
 .../cmucl/{cmucl-20c.ebuild => cmucl-20d.ebuild}   |   23 ++---
 ...20b-customize-lisp-implementation-version.patch |   16 ---
 dev-lisp/cmucl/files/20b-execstack-fixes.patch     |  118 -------------------
 dev-lisp/cmucl/files/20b-nositeinit-build.patch    |   18 ---
 dev-lisp/cmucl/files/20b-patch001.patch            |  119 --------------------
 dev-lisp/cmucl/files/cmuclrc                       |    2 +
 7 files changed, 11 insertions(+), 365 deletions(-)

diff --git a/dev-lisp/cmucl/cmucl-20b_p001-r1.ebuild b/dev-lisp/cmucl/cmucl-20b_p001-r1.ebuild
deleted file mode 100644
index c1d8b02..0000000
--- a/dev-lisp/cmucl/cmucl-20b_p001-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-inherit eutils glo-utils toolchain-funcs
-
-MY_PV=${PV:0:3}
-
-DESCRIPTION="CMU Common Lisp is an implementation of ANSI Common Lisp"
-HOMEPAGE="http://www.cons.org/cmucl/"
-SRC_URI="http://common-lisp.net/project/cmucl/downloads/release/${MY_PV}/cmucl-src-${MY_PV}.tar.bz2
-	http://common-lisp.net/project/cmucl/downloads/release/${MY_PV}/cmucl-${MY_PV}-x86-linux.tar.bz2"
-RESTRICT="mirror"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="+asdf X source sse2"
-
-DEPEND="x11-libs/motif:0
-		sys-devel/bc"
-
-RDEPEND="x11-libs/motif:0
-		asdf? ( >=dev-lisp/gentoo-init-1.0 )"
-
-S="${WORKDIR}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${MY_PV}-patch001.patch
-	epatch "${FILESDIR}"/fix-man-and-doc-installation.patch
-	epatch "${FILESDIR}"/${MY_PV}-execstack-fixes.patch
-	epatch "${FILESDIR}"/${MY_PV}-customize-lisp-implementation-version.patch
-	epatch "${FILESDIR}"/${MY_PV}-nositeinit-build.patch
-}
-
-src_compile() {
-	local cmufpu=$(glo_usev sse2 sse2 x87)
-	local cmuopts="$(glo_usev !X -u) -f ${cmufpu}"
-	local buildimage="bin/lisp -core lib/cmucl/lib/lisp-${cmufpu}.core -noinit -nositeinit -batch"
-	env CC="$(tc-getCC)" src/tools/build.sh -v "-gentoo-${PR}" -C "" -o "${buildimage}" ${cmuopts} || die "Cannot build the compiler"
-}
-
-src_install() {
-	env MANDIR=share/man/man1 DOCDIR=share/doc/${PF} \
-		src/tools/make-dist.sh -S -g -G root -O root build-4 ${MY_PV} x86 linux \
-		|| die "Cannot build installation archive"
-	# Necessary otherwise tar will fail
-	dodir /usr
-	pushd "${D}"/usr
-	tar xzpf "${WORKDIR}"/cmucl-${MY_PV}-x86-linux.tar.gz \
-		|| die "Cannot install main system"
-	if use X ; then
-		tar xzpf "${WORKDIR}"/cmucl-${MY_PV}-x86-linux.extra.tar.gz \
-			|| die "Cannot install extra files"
-	fi
-	if use source; then
-		# Necessary otherwise tar will fail
-		dodir /usr/share/common-lisp/source/${PN}
-		cd "${D}"/usr/share/common-lisp/source/${PN}
-		tar --strip-components 1 -xzpf "${WORKDIR}"/cmucl-src-${MY_PV}.tar.gz \
-			|| die "Cannot install sources"
-	fi
-	popd
-
-	# Install site config file
-	sed "s,@PF@,${PF},g ; s,@VERSION@,$(date +%F),g" \
-		< "${FILESDIR}"/site-init.lisp.in \
-		> "${D}"/usr/$(get_libdir)/cmucl/site-init.lisp \
-		|| die "Cannot fix site-init.lisp"
-	cp "${FILESDIR}"/cmuclrc .
-	if use asdf; then
-		cat >> cmuclrc <<EOF
-;;; Setup ASDF2
-(load "/etc/common-lisp/gentoo-init.lisp")
-EOF
-	fi
-	insinto /etc/common-lisp
-	doins cmuclrc || die "Failed to install cmuclrc"
-}

diff --git a/dev-lisp/cmucl/cmucl-20c.ebuild b/dev-lisp/cmucl/cmucl-20d.ebuild
similarity index 85%
rename from dev-lisp/cmucl/cmucl-20c.ebuild
rename to dev-lisp/cmucl/cmucl-20d.ebuild
index 0ab725d..d9e5dec 100644
--- a/dev-lisp/cmucl/cmucl-20c.ebuild
+++ b/dev-lisp/cmucl/cmucl-20d.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI=3
+EAPI=5
 inherit eutils glo-utils toolchain-funcs
 
 MY_PV=${PV:0:3}
@@ -16,19 +16,21 @@ RESTRICT="mirror"
 LICENSE="public-domain"
 SLOT="0"
 KEYWORDS="~x86"
-IUSE="+asdf X source sse2"
+IUSE="X source sse2"
 
 DEPEND="x11-libs/motif:0
-		sys-devel/bc"
+		sys-devel/bc
+		>=dev-lisp/asdf-2.33-r1:="
 
-RDEPEND="x11-libs/motif:0
-		asdf? ( >=dev-lisp/gentoo-init-1.0 )"
+RDEPEND="x11-libs/motif:0"
 
 S="${WORKDIR}"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${MY_PV}-execstack-fixes.patch
 	epatch "${FILESDIR}"/${MY_PV}-customize-lisp-implementation-version.patch
+
+	cp /usr/share/common-lisp/source/asdf/build/asdf.lisp src/contrib/asdf/ || die
 }
 
 src_compile() {
@@ -65,13 +67,6 @@ src_install() {
 		< "${FILESDIR}"/site-init.lisp.in \
 		> "${D}"/usr/$(get_libdir)/cmucl/site-init.lisp \
 		|| die "Cannot fix site-init.lisp"
-	cp "${FILESDIR}"/cmuclrc .
-	if use asdf; then
-		cat >> cmuclrc <<EOF
-;;; Setup ASDF2
-(load "/etc/common-lisp/gentoo-init.lisp")
-EOF
-	fi
 	insinto /etc/common-lisp
-	doins cmuclrc || die "Failed to install cmuclrc"
+	doins "${FILESDIR}"/cmuclrc || die "Failed to install cmuclrc"
 }

diff --git a/dev-lisp/cmucl/files/20b-customize-lisp-implementation-version.patch b/dev-lisp/cmucl/files/20b-customize-lisp-implementation-version.patch
deleted file mode 100644
index 41da86d..0000000
--- a/dev-lisp/cmucl/files/20b-customize-lisp-implementation-version.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur cmucl.orig/src/code/misc.lisp cmucl/src/code/misc.lisp
---- cmucl.orig/src/code/misc.lisp	2010-04-20 19:57:45.000000000 +0200
-+++ cmucl/src/code/misc.lisp	2010-10-15 02:15:53.064623104 +0200
-@@ -181,8 +181,10 @@
- 
- (defun lisp-implementation-version ()
-   "Returns a string describing the implementation version."
--  (format nil "~A (~X~A)" *lisp-implementation-version* c:byte-fasl-file-version
--	  #+unicode (intl:gettext " Unicode") #-unicode ""))
-+  (format nil "~X~A~A"
-+          c:byte-fasl-file-version
-+          #+unicode "-unicode" #-unicode ""
-+          *lisp-implementation-version*))
- 
- (defun machine-instance ()
-   "Returns a string giving the name of the local machine."

diff --git a/dev-lisp/cmucl/files/20b-execstack-fixes.patch b/dev-lisp/cmucl/files/20b-execstack-fixes.patch
deleted file mode 100644
index 034848d..0000000
--- a/dev-lisp/cmucl/files/20b-execstack-fixes.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff -Naur work.old/src/lisp/alpha-assem.S work/src/lisp/alpha-assem.S
---- work.old/src/lisp/alpha-assem.S	2003-03-06 11:13:09.000000000 -0300
-+++ work/src/lisp/alpha-assem.S	2010-05-10 00:06:34.000000000 -0300
-@@ -297,3 +297,7 @@
- function_end_breakpoint_end:
- 
- 
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-diff -Naur work.old/src/lisp/amd64-assem.S work/src/lisp/amd64-assem.S
---- work.old/src/lisp/amd64-assem.S	2004-07-27 19:03:53.000000000 -0300
-+++ work/src/lisp/amd64-assem.S	2010-05-10 00:06:34.000000000 -0300
-@@ -1051,3 +1051,7 @@
- 	.end
- 
- #endif /* LINKAGE_TABLE */
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-diff -Naur work.old/src/lisp/backtrace.c work/src/lisp/backtrace.c
---- work.old/src/lisp/backtrace.c	2009-06-11 13:04:01.000000000 -0300
-+++ work/src/lisp/backtrace.c	2010-05-10 00:06:22.000000000 -0300
-@@ -3,6 +3,8 @@
-  * Simple backtrace facility.  More or less from Rob's lisp version.
-  */
- 
-+#include "os-common.h"
-+
- #include <stdio.h>
- #include <signal.h>
- #include "lisp.h"
-diff -Naur work.old/src/lisp/hppa-assem.S work/src/lisp/hppa-assem.S
---- work.old/src/lisp/hppa-assem.S	2002-08-23 14:05:35.000000000 -0300
-+++ work/src/lisp/hppa-assem.S	2010-05-10 00:06:34.000000000 -0300
-@@ -460,3 +460,7 @@
- 
- 	.export	function_end_breakpoint_end
- function_end_breakpoint_end
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-diff -Naur work.old/src/lisp/linux-stubs.S work/src/lisp/linux-stubs.S
---- work.old/src/lisp/linux-stubs.S	2005-08-17 00:40:16.000000000 -0300
-+++ work/src/lisp/linux-stubs.S	2010-05-10 00:06:34.000000000 -0300
-@@ -995,3 +995,7 @@
- /*  doe(yperr_string) */
- /*  doe(ypprot_err) */
- #endif /* defined(LINKAGE_TABLE) && !defined(__FreeBSD__) */
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-diff -Naur work.old/src/lisp/lisp.c work/src/lisp/lisp.c
---- work.old/src/lisp/lisp.c	2009-07-13 16:41:54.000000000 -0300
-+++ work/src/lisp/lisp.c	2010-05-10 00:05:55.000000000 -0300
-@@ -5,6 +5,9 @@
-  *
-  */
- 
-+#include "os-common.h"
-+#include <time.h>
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <limits.h>
-diff -Naur work.old/src/lisp/mips-assem.S work/src/lisp/mips-assem.S
---- work.old/src/lisp/mips-assem.S	2002-08-23 14:01:02.000000000 -0300
-+++ work/src/lisp/mips-assem.S	2010-05-10 00:06:34.000000000 -0300
-@@ -402,3 +402,7 @@
- 	move	v0, a1
- 	j	_restore_state
- 	.end	save_state
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-diff -Naur work.old/src/lisp/os-common.h work/src/lisp/os-common.h
---- work.old/src/lisp/os-common.h	1969-12-31 21:00:00.000000000 -0300
-+++ work/src/lisp/os-common.h	2010-05-10 00:06:22.000000000 -0300
-@@ -0,0 +1 @@
-+char* convert_lisp_string(char *c_string, void *lisp_string, int len);
-diff -Naur work.old/src/lisp/ppc-assem.S work/src/lisp/ppc-assem.S
---- work.old/src/lisp/ppc-assem.S	2006-02-25 01:35:58.000000000 -0300
-+++ work/src/lisp/ppc-assem.S	2010-05-10 00:06:34.000000000 -0300
-@@ -721,3 +721,7 @@
- 	SET_SIZE(fpu_restore)
- 	
- #endif
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-diff -Naur work.old/src/lisp/sparc-assem.S work/src/lisp/sparc-assem.S
---- work.old/src/lisp/sparc-assem.S	2003-10-23 23:57:00.000000000 -0300
-+++ work/src/lisp/sparc-assem.S	2010-05-10 00:06:34.000000000 -0300
-@@ -837,3 +837,7 @@
-  * End:
-  */						
- 		
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-diff -Naur work.old/src/lisp/x86-assem.S work/src/lisp/x86-assem.S
---- work.old/src/lisp/x86-assem.S	2008-12-24 02:36:40.000000000 -0200
-+++ work/src/lisp/x86-assem.S	2010-05-10 00:06:34.000000000 -0300
-@@ -798,3 +798,7 @@
- ENDFUNC(undefined_foreign_symbol_trap)
- 
- #endif /* LINKAGE_TABLE */
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif

diff --git a/dev-lisp/cmucl/files/20b-nositeinit-build.patch b/dev-lisp/cmucl/files/20b-nositeinit-build.patch
deleted file mode 100644
index 3aea006..0000000
--- a/dev-lisp/cmucl/files/20b-nositeinit-build.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Author: Stelian Ionescu <sionescu@cddr.org>
-Date: 2010-11-03
-Status: Upstream
-Description: Avoids loading the site init during build
-
-diff -ur cmucl.orig//src/tools/build.sh cmucl/src/tools/build.sh
---- cmucl.orig//src/tools/build.sh	2010-09-02 18:16:18.000000000 +0200
-+++ cmucl/src/tools/build.sh	2010-11-03 15:57:06.615611658 +0100
-@@ -126,7 +126,8 @@
- 	fi
- 	$TOOLDIR/load-world.sh $TARGET "$VERSION" || { echo "Failed: $TOOLDIR/load-world.sh"; exit 1; }
- 
--	$TARGET/lisp/lisp -batch -noinit $FPU_MODE < /dev/null || { echo "Failed: $TARGET/lisp/lisp -batch -noinit $FPU_MODE"; exit 1; }
-+	$TARGET/lisp/lisp -batch -noinit -nositeinit $FPU_MODE < /dev/null || \
-+            { echo "Failed: $TARGET/lisp/lisp -batch -noinit $FPU_MODE"; exit 1; }
- 	return 0;
-     fi
- }

diff --git a/dev-lisp/cmucl/files/20b-patch001.patch b/dev-lisp/cmucl/files/20b-patch001.patch
deleted file mode 100644
index 4e5a6dc..0000000
--- a/dev-lisp/cmucl/files/20b-patch001.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-Author: Raymond Toy <rtoy@common-lisp.net>
-Date: 2010-11-02
-Status: Upstream
-Description: Fixes bug in SSE2 VOP for COMPLEX arrays
-
-diff -ru cmucl.orig//src/compiler/x86/float-sse2.lisp cmucl/src/compiler/x86/float-sse2.lisp
---- cmucl.orig//src/compiler/x86/float-sse2.lisp	2010-08-15 17:09:41.000000000 +0200
-+++ cmucl/src/compiler/x86/float-sse2.lisp	2010-11-01 13:41:54.860889371 +0100
-@@ -7,7 +7,7 @@
- ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
- ;;;
- (ext:file-comment
--  "$Header: /project/cmucl/cvsroot/src/compiler/x86/float-sse2.lisp,v 1.16.2.2 2010-08-15 15:09:41 rtoy Exp $")
-+  "$Header: /project/cmucl/cvsroot/src/compiler/x86/float-sse2.lisp,v 1.19 2010-10-28 00:00:48 rtoy Exp $")
- ;;;
- ;;; **********************************************************************
- ;;;
-@@ -1390,13 +1390,19 @@
-   (:arg-types complex-single-float)
-   (:results (r :scs (single-reg)))
-   (:result-types single-float)
-+  (:temporary (:sc single-reg) temp)
-   (:policy :fast-safe)
-   (:note _N"complex float realpart")
-   (:generator 3
-     (sc-case x
-       (complex-single-reg
--       (inst xorps r r)			; temp = 0|0|0|0
--       (inst movss r x))		; r = 0|0|0|x
-+       (cond ((location= r x)
-+	      (inst xorps temp temp)	; temp = 0|0|0|0
-+	      (inst movss temp x)	; temp = 0|0|0|x
-+	      (inst movss r temp))	; r = temp
-+	     (t
-+	      (inst xorps r r)		; temp = 0|0|0|0
-+	      (inst movss r x))))	; r = 0|0|0|x
-       (complex-single-stack
-        (inst movss r (ea-for-csf-real-stack x)))
-       (descriptor-reg
-@@ -1408,13 +1414,19 @@
-   (:arg-types complex-double-float)
-   (:results (r :scs (double-reg)))
-   (:result-types double-float)
-+  (:temporary (:sc double-reg) temp)
-   (:policy :fast-safe)
--  (:note _N"complex float realpart")
-+  (:note "complex float realpart")
-   (:generator 3
-     (sc-case x
-       (complex-double-reg
--       (inst xorpd r r)			; temp = 0|0
--       (inst movsd r x))		; r = 0|x
-+       (cond ((location= r x)
-+	      (inst xorpd temp temp)	; temp = 0|0
-+	      (inst movsd temp x)	; temp = 0|x
-+	      (inst movsd r temp))	; r = temp
-+	     (t
-+	      (inst xorpd r r)		; r = 0|0
-+	      (inst movsd r x))))	; r = 0|x
-       (complex-double-stack
-        (inst movsd r (ea-for-cdf-real-stack x)))
-       (descriptor-reg
-@@ -1457,8 +1469,13 @@
-   (:generator 3
-     (sc-case x
-       (complex-double-reg
--       (inst xorpd r r)			; r = 0|0
--       (inst movhlps r x))		; r = 0|b
-+       (cond ((location= r x)
-+	      (inst xorpd temp temp)	; temp = 0|0
-+	      (inst movhlps temp x)	; temp = 0|b
-+	      (inst movsd r temp))	; r = temp
-+	     (t
-+	      (inst xorpd r r)		; r = 0|0
-+	      (inst movhlps r x))))	; r = 0|b
-       (complex-double-stack
-        (inst movsd r (ea-for-cdf-imag-stack x)))
-       (descriptor-reg
-@@ -1835,7 +1852,7 @@
-   (convert-complex %complex-single-float cvtpd2ps complex-single complex-double))
- 
- (macrolet
--    ((convert-complex (trans op base-ea to from)
-+    ((convert-complex (trans op base-ea to from movinst)
-        (let ((name (symbolicate to "/" from))
- 	     (from-sc (symbolicate from "-REG"))
- 	     (from-sc-stack (symbolicate from "-STACK"))
-@@ -1849,21 +1866,27 @@
- 	   (:arg-types ,from-type)
- 	   (:results (r :scs (,to-sc)))
- 	   (:result-types ,to-type)
-+	   (:temporary (:sc ,to-sc) temp)
- 	   (:policy :fast-safe)
- 	   (:generator 1
- 	     (sc-case x
- 	       (,from-sc
- 		;; Need to make sure the imaginary part is zero
--		(inst xorps r r)
--		(inst ,op r x))
-+		(cond ((location= x r)
-+		       (inst xorps temp temp)
-+		       (inst ,op temp x)
-+		       (inst ,movinst r temp))
-+		      (t
-+		       (inst xorps r r)
-+		       (inst ,op r x))))
- 	       (,from-sc-stack
- 		(inst xorps r r)
- 		(inst ,op r (,(symbolicate "EA-FOR-" base-ea "-STACK") x)))
- 	       (descriptor-reg
- 		(inst xorps r r)
- 		(inst ,op r (,(symbolicate "EA-FOR-" base-ea "-DESC") x)))))))))
--  (convert-complex %complex-double-float cvtss2sd sf complex-double single)
--  (convert-complex %complex-single-float cvtsd2ss df complex-single double))
-+  (convert-complex %complex-double-float cvtss2sd sf complex-double single movapd)
-+  (convert-complex %complex-single-float cvtsd2ss df complex-single double movaps))
- 
- ;; Add and subtract for two complex arguments
- (macrolet

diff --git a/dev-lisp/cmucl/files/cmuclrc b/dev-lisp/cmucl/files/cmuclrc
index ecdad5a..18ab562 100644
--- a/dev-lisp/cmucl/files/cmuclrc
+++ b/dev-lisp/cmucl/files/cmuclrc
@@ -3,3 +3,5 @@
 
 (in-package :common-lisp-user)
 
+;;; Setup ASDF3
+(load "/etc/common-lisp/gentoo-init.lisp")


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/lisp:master commit in: dev-lisp/cmucl/files/, dev-lisp/cmucl/
@ 2018-05-02 21:19 José María Alonso
  0 siblings, 0 replies; 6+ messages in thread
From: José María Alonso @ 2018-05-02 21:19 UTC (permalink / raw
  To: gentoo-commits

commit:     3d1ccab4bd419cb1c718834ce307ed707068a464
Author:     Chema Alonso Josa <nimiux <AT> gentoo <DOT> org>
AuthorDate: Wed May  2 21:19:46 2018 +0000
Commit:     José María Alonso <nimiux <AT> gentoo <DOT> org>
CommitDate: Wed May  2 21:19:46 2018 +0000
URL:        https://gitweb.gentoo.org/proj/lisp.git/commit/?id=3d1ccab4

dev-lisp/cmucl: Drops old version 20e

 dev-lisp/cmucl/cmucl-20e.ebuild                    |  97 -----------------
 ...20e-customize-lisp-implementation-version.patch |  16 ---
 dev-lisp/cmucl/files/20e-execstack-fixes.patch     | 118 ---------------------
 3 files changed, 231 deletions(-)

diff --git a/dev-lisp/cmucl/cmucl-20e.ebuild b/dev-lisp/cmucl/cmucl-20e.ebuild
deleted file mode 100644
index 9e122b9a..00000000
--- a/dev-lisp/cmucl/cmucl-20e.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs multilib
-
-MY_PV=${PV:0:3}
-
-DESCRIPTION="CMU Common Lisp is an implementation of ANSI Common Lisp"
-HOMEPAGE="http://www.cons.org/cmucl/"
-SRC_URI="http://common-lisp.net/project/cmucl/downloads/release/${MY_PV}/cmucl-src-${MY_PV}.tar.bz2
-	http://common-lisp.net/project/cmucl/downloads/release/${MY_PV}/cmucl-${MY_PV}-x86-linux.tar.bz2"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="X source cpu_flags_x86_sse2"
-
-CDEPEND=">=dev-lisp/asdf-2.33-r3:=
-		 x11-libs/motif:0"
-DEPEND="${CDEPEND}
-		sys-devel/bc"
-RDEPEND="${CDEPEND}"
-
-S="${WORKDIR}"
-
-TARGET=linux-4
-
-src_prepare() {
-	epatch "${FILESDIR}"/${MY_PV}-execstack-fixes.patch
-	epatch "${FILESDIR}"/${MY_PV}-customize-lisp-implementation-version.patch
-
-	cp /usr/share/common-lisp/source/asdf/build/asdf.lisp src/contrib/asdf/ || die
-}
-
-src_compile() {
-	local cmufpu cmuopts
-
-	if use cpu_flags_x86_sse2; then
-		cmufpu=sse2
-	else
-		cmufpu=x87
-	fi
-
-	if use X; then
-		cmuopts="-f ${cmufpu}"
-	else
-		cmuopts="-u -f ${cmufpu}"
-	fi
-
-	local buildimage="bin/lisp -core lib/cmucl/lib/lisp-${cmufpu}.core -noinit -nositeinit -batch"
-
-	env CC="$(tc-getCC)" bin/build.sh -v "-gentoo-${PR}" -C "" -o "${buildimage}" ${cmuopts} || die "Cannot build the compiler"
-
-	# Compile up the asdf and defsystem modules
-	${TARGET}/lisp/lisp -noinit -nositeinit -batch << EOF || die
-(in-package :cl-user)
-(setf (ext:search-list "target:")
-	  '("$TARGET/" "src/"))
-(setf (ext:search-list "modules:")
-	  '("target:contrib/"))
-
-(compile-file "modules:asdf/asdf")
-(compile-file "modules:defsystem/defsystem")
-EOF
-}
-
-src_install() {
-	env MANDIR=share/man/man1 DOCDIR=share/doc/${PF} \
-		bin/make-dist.sh -S -g -G root -O root ${TARGET} ${MY_PV} x86 linux \
-		|| die "Cannot build installation archive"
-	# Necessary otherwise tar will fail
-	dodir /usr
-	pushd "${D}"/usr > /dev/null
-	tar xzpf "${WORKDIR}"/cmucl-${MY_PV}-x86-linux.tar.gz \
-		|| die "Cannot install main system"
-	if use X ; then
-		tar xzpf "${WORKDIR}"/cmucl-${MY_PV}-x86-linux.extra.tar.gz \
-			|| die "Cannot install extra files"
-	fi
-	if use source; then
-		# Necessary otherwise tar will fail
-		dodir /usr/share/common-lisp/source/${PN}
-		cd "${D}"/usr/share/common-lisp/source/${PN}
-		tar --strip-components 1 -xzpf "${WORKDIR}"/cmucl-src-${MY_PV}.tar.gz \
-			|| die "Cannot install sources"
-	fi
-	popd > /dev/null
-
-	# Install site config file
-	sed "s,@PF@,${PF},g ; s,@VERSION@,$(date +%F),g" \
-		< "${FILESDIR}"/site-init.lisp.in \
-		> "${D}"/usr/$(get_libdir)/cmucl/site-init.lisp \
-		|| die "Cannot fix site-init.lisp"
-	insinto /etc/common-lisp
-	doins "${FILESDIR}"/cmuclrc || die "Failed to install cmuclrc"
-}

diff --git a/dev-lisp/cmucl/files/20e-customize-lisp-implementation-version.patch b/dev-lisp/cmucl/files/20e-customize-lisp-implementation-version.patch
deleted file mode 100644
index 8fc9278a..00000000
--- a/dev-lisp/cmucl/files/20e-customize-lisp-implementation-version.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur cmucl.orig/src/code/misc.lisp cmucl/src/code/misc.lisp
---- cmucl.orig/src/code/misc.lisp	2011-10-25 05:31:39.000000000 +0200
-+++ cmucl/src/code/misc.lisp	2012-01-31 21:46:49.441273068 +0100
-@@ -187,8 +187,10 @@
- 
- (defun lisp-implementation-version ()
-   "Returns a string describing the implementation version."
--  (format nil "~A (~X~A)" *lisp-implementation-version* c:byte-fasl-file-version
--	  #+unicode _" Unicode" #-unicode ""))
-+  (format nil "~X~A~A"
-+          c:byte-fasl-file-version
-+          #+unicode "-unicode" #-unicode ""
-+          *lisp-implementation-version*))
- 
- (defun machine-instance ()
-   "Returns a string giving the name of the local machine."

diff --git a/dev-lisp/cmucl/files/20e-execstack-fixes.patch b/dev-lisp/cmucl/files/20e-execstack-fixes.patch
deleted file mode 100644
index 034848d6..00000000
--- a/dev-lisp/cmucl/files/20e-execstack-fixes.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-diff -Naur work.old/src/lisp/alpha-assem.S work/src/lisp/alpha-assem.S
---- work.old/src/lisp/alpha-assem.S	2003-03-06 11:13:09.000000000 -0300
-+++ work/src/lisp/alpha-assem.S	2010-05-10 00:06:34.000000000 -0300
-@@ -297,3 +297,7 @@
- function_end_breakpoint_end:
- 
- 
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-diff -Naur work.old/src/lisp/amd64-assem.S work/src/lisp/amd64-assem.S
---- work.old/src/lisp/amd64-assem.S	2004-07-27 19:03:53.000000000 -0300
-+++ work/src/lisp/amd64-assem.S	2010-05-10 00:06:34.000000000 -0300
-@@ -1051,3 +1051,7 @@
- 	.end
- 
- #endif /* LINKAGE_TABLE */
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-diff -Naur work.old/src/lisp/backtrace.c work/src/lisp/backtrace.c
---- work.old/src/lisp/backtrace.c	2009-06-11 13:04:01.000000000 -0300
-+++ work/src/lisp/backtrace.c	2010-05-10 00:06:22.000000000 -0300
-@@ -3,6 +3,8 @@
-  * Simple backtrace facility.  More or less from Rob's lisp version.
-  */
- 
-+#include "os-common.h"
-+
- #include <stdio.h>
- #include <signal.h>
- #include "lisp.h"
-diff -Naur work.old/src/lisp/hppa-assem.S work/src/lisp/hppa-assem.S
---- work.old/src/lisp/hppa-assem.S	2002-08-23 14:05:35.000000000 -0300
-+++ work/src/lisp/hppa-assem.S	2010-05-10 00:06:34.000000000 -0300
-@@ -460,3 +460,7 @@
- 
- 	.export	function_end_breakpoint_end
- function_end_breakpoint_end
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-diff -Naur work.old/src/lisp/linux-stubs.S work/src/lisp/linux-stubs.S
---- work.old/src/lisp/linux-stubs.S	2005-08-17 00:40:16.000000000 -0300
-+++ work/src/lisp/linux-stubs.S	2010-05-10 00:06:34.000000000 -0300
-@@ -995,3 +995,7 @@
- /*  doe(yperr_string) */
- /*  doe(ypprot_err) */
- #endif /* defined(LINKAGE_TABLE) && !defined(__FreeBSD__) */
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-diff -Naur work.old/src/lisp/lisp.c work/src/lisp/lisp.c
---- work.old/src/lisp/lisp.c	2009-07-13 16:41:54.000000000 -0300
-+++ work/src/lisp/lisp.c	2010-05-10 00:05:55.000000000 -0300
-@@ -5,6 +5,9 @@
-  *
-  */
- 
-+#include "os-common.h"
-+#include <time.h>
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <limits.h>
-diff -Naur work.old/src/lisp/mips-assem.S work/src/lisp/mips-assem.S
---- work.old/src/lisp/mips-assem.S	2002-08-23 14:01:02.000000000 -0300
-+++ work/src/lisp/mips-assem.S	2010-05-10 00:06:34.000000000 -0300
-@@ -402,3 +402,7 @@
- 	move	v0, a1
- 	j	_restore_state
- 	.end	save_state
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-diff -Naur work.old/src/lisp/os-common.h work/src/lisp/os-common.h
---- work.old/src/lisp/os-common.h	1969-12-31 21:00:00.000000000 -0300
-+++ work/src/lisp/os-common.h	2010-05-10 00:06:22.000000000 -0300
-@@ -0,0 +1 @@
-+char* convert_lisp_string(char *c_string, void *lisp_string, int len);
-diff -Naur work.old/src/lisp/ppc-assem.S work/src/lisp/ppc-assem.S
---- work.old/src/lisp/ppc-assem.S	2006-02-25 01:35:58.000000000 -0300
-+++ work/src/lisp/ppc-assem.S	2010-05-10 00:06:34.000000000 -0300
-@@ -721,3 +721,7 @@
- 	SET_SIZE(fpu_restore)
- 	
- #endif
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-diff -Naur work.old/src/lisp/sparc-assem.S work/src/lisp/sparc-assem.S
---- work.old/src/lisp/sparc-assem.S	2003-10-23 23:57:00.000000000 -0300
-+++ work/src/lisp/sparc-assem.S	2010-05-10 00:06:34.000000000 -0300
-@@ -837,3 +837,7 @@
-  * End:
-  */						
- 		
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif
-diff -Naur work.old/src/lisp/x86-assem.S work/src/lisp/x86-assem.S
---- work.old/src/lisp/x86-assem.S	2008-12-24 02:36:40.000000000 -0200
-+++ work/src/lisp/x86-assem.S	2010-05-10 00:06:34.000000000 -0300
-@@ -798,3 +798,7 @@
- ENDFUNC(undefined_foreign_symbol_trap)
- 
- #endif /* LINKAGE_TABLE */
-+
-+#if defined(__linux__) && defined(__ELF__)
-+.section .note.GNU-stack,"",%progbits
-+#endif


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/lisp:master commit in: dev-lisp/cmucl/files/, dev-lisp/cmucl/
@ 2018-05-02 21:22 José María Alonso
  0 siblings, 0 replies; 6+ messages in thread
From: José María Alonso @ 2018-05-02 21:22 UTC (permalink / raw
  To: gentoo-commits

commit:     1febb5c0d09f2d76381b345391f60b5f95b68ea5
Author:     Chema Alonso Josa <nimiux <AT> gentoo <DOT> org>
AuthorDate: Wed May  2 21:22:56 2018 +0000
Commit:     José María Alonso <nimiux <AT> gentoo <DOT> org>
CommitDate: Wed May  2 21:22:56 2018 +0000
URL:        https://gitweb.gentoo.org/proj/lisp.git/commit/?id=1febb5c0

dev-lisp/cmucl: Bumps version to 21c

 dev-lisp/cmucl/cmucl-21c.ebuild                    | 109 +++++++++++++++++++
 dev-lisp/cmucl/files/21c-build.patch               |  22 ++++
 ...21c-customize-lisp-implementation-version.patch |  16 +++
 dev-lisp/cmucl/files/21c-execstack-fixes.patch     | 118 +++++++++++++++++++++
 4 files changed, 265 insertions(+)

diff --git a/dev-lisp/cmucl/cmucl-21c.ebuild b/dev-lisp/cmucl/cmucl-21c.ebuild
new file mode 100644
index 00000000..15054747
--- /dev/null
+++ b/dev-lisp/cmucl/cmucl-21c.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils toolchain-funcs multilib
+
+MY_PV=${PV:0:3}
+
+DESCRIPTION="CMU Common Lisp is an implementation of ANSI Common Lisp"
+HOMEPAGE="http://www.cons.org/cmucl/"
+SRC_URI="http://common-lisp.net/project/cmucl/downloads/release/${MY_PV}/cmucl-src-${MY_PV}.tar.bz2
+	http://common-lisp.net/project/cmucl/downloads/release/${MY_PV}/cmucl-${MY_PV}-x86-linux.tar.bz2"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="X doc source"
+
+CDEPEND=">=dev-lisp/asdf-2.33-r3:=
+		 x11-libs/motif:0"
+DEPEND="${CDEPEND}
+	sys-devel/bc
+	doc? ( virtual/latex-base )"
+RDEPEND="${CDEPEND}"
+
+S="${WORKDIR}"
+
+TARGET=linux-4
+
+src_prepare() {
+	eapply "${FILESDIR}"/${MY_PV}-execstack-fixes.patch
+	eapply "${FILESDIR}"/${MY_PV}-customize-lisp-implementation-version.patch
+	eapply "${FILESDIR}"/${MY_PV}-build.patch
+	eapply_user
+	#cp "${FILESDIR}"/os-common.h src/lisp/ || die
+	cp /usr/share/common-lisp/source/asdf/build/asdf.lisp src/contrib/asdf/ || die
+}
+
+src_compile() {
+	local cmuopts buildimage
+
+	if use X; then
+		cmuopts=""
+	else
+		cmuopts="-u"
+	fi
+
+	buildimage="bin/lisp -batch"
+
+	env CC="$(tc-getCC)" bin/build.sh -v "-gentoo-${PR}" -C "" -o "${buildimage}" ${cmuopts} || die "Cannot build the compiler"
+
+	# Compile up the asdf and defsystem modules
+	${TARGET}/lisp/lisp -noinit -nositeinit -batch << EOF || die
+(in-package :cl-user)
+(setf (ext:search-list "target:")
+	  '("$TARGET/" "src/"))
+(setf (ext:search-list "modules:")
+	  '("target:contrib/"))
+
+(compile-file "modules:asdf/asdf")
+(compile-file "modules:defsystem/defsystem")
+EOF
+
+	# documentation
+	if use doc; then
+		pushd src/docs/cmu-user > /dev/null || die "directory src/docs/cmu-user does not exist"
+		emake
+		cd ../internals || die "directory src/docs/internals does not exist"
+		emake
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	bin/make-dist.sh -S -g -G root -O root -M share/man/man1 -V ${MY_PV} -A x86 -o linux ${TARGET} \
+		|| die "Cannot build installation archive"
+	# Necessary otherwise tar will fail
+	dodir /usr
+	pushd "${D}"/usr > /dev/null
+	tar xzpf "${WORKDIR}"/cmucl-${MY_PV}-x86-linux.tar.gz \
+		|| die "Cannot install main system"
+	if use X ; then
+		tar xzpf "${WORKDIR}"/cmucl-${MY_PV}-x86-linux.extra.tar.gz \
+			|| die "Cannot install extra files"
+	fi
+	if use source; then
+		# Necessary otherwise tar will fail
+		dodir /usr/share/common-lisp/source/${PN}
+		cd "${D}"/usr/share/common-lisp/source/${PN}
+		tar --strip-components 1 -xzpf "${WORKDIR}"/cmucl-src-${MY_PV}.tar.gz \
+			|| die "Cannot install sources"
+	fi
+	popd > /dev/null
+
+	# Install site config file
+	sed "s,@PF@,${PF},g ; s,@VERSION@,$(date +%F),g" \
+		< "${FILESDIR}"/site-init.lisp.in \
+		> "${D}"/usr/$(get_libdir)/cmucl/site-init.lisp \
+		|| die "Cannot fix site-init.lisp"
+	insinto /etc/common-lisp
+	doins "${FILESDIR}"/cmuclrc || die "Failed to install cmuclrc"
+
+	# documentation
+	dodoc doc/cmucl/README
+	if use doc; then
+		insinto /usr/share/doc/${PF}
+		doins src/docs/cmu-user/cmu-user.pdf src/docs/internals/design.pdf
+	fi
+}

diff --git a/dev-lisp/cmucl/files/21c-build.patch b/dev-lisp/cmucl/files/21c-build.patch
new file mode 100644
index 00000000..4d7e4061
--- /dev/null
+++ b/dev-lisp/cmucl/files/21c-build.patch
@@ -0,0 +1,22 @@
+diff -r -U2 21a.orig/bin/build.sh 21a/bin/build.sh
+--- 21a.orig/bin/build.sh	2015-05-19 07:42:40.000000000 +0600
++++ 21a/bin/build.sh	2016-04-03 20:54:08.597016537 +0600
+@@ -40,5 +40,5 @@
+ ENABLE4="yes"
+ 
+-version=21b
++version=21c
+ SRCDIR=src
+ BINDIR=bin
+@@ -145,10 +145,9 @@
+ 	$TOOLDIR/load-world.sh $TARGET "$VERSION" || { echo "Failed: $TOOLDIR/load-world.sh"; exit 1; }
+ 
+-	$TARGET/lisp/lisp -batch -noinit -nositeinit $FPU_MODE < /dev/null || { echo "Failed: $TARGET/lisp/lisp -batch -noinit $FPU_MODE"; exit 1; }
++	$TARGET/lisp/lisp -batch -noinit -nositeinit < /dev/null || { echo "Failed: $TARGET/lisp/lisp -batch -noinit"; exit 1; }
+ 	return 0;
+     fi
+ }
+ 
+-FPU_MODE=
+ BUILDWORLD="$TOOLDIR/build-world.sh"
+ BUILD_POT="yes"

diff --git a/dev-lisp/cmucl/files/21c-customize-lisp-implementation-version.patch b/dev-lisp/cmucl/files/21c-customize-lisp-implementation-version.patch
new file mode 100644
index 00000000..8fc9278a
--- /dev/null
+++ b/dev-lisp/cmucl/files/21c-customize-lisp-implementation-version.patch
@@ -0,0 +1,16 @@
+diff -ur cmucl.orig/src/code/misc.lisp cmucl/src/code/misc.lisp
+--- cmucl.orig/src/code/misc.lisp	2011-10-25 05:31:39.000000000 +0200
++++ cmucl/src/code/misc.lisp	2012-01-31 21:46:49.441273068 +0100
+@@ -187,8 +187,10 @@
+ 
+ (defun lisp-implementation-version ()
+   "Returns a string describing the implementation version."
+-  (format nil "~A (~X~A)" *lisp-implementation-version* c:byte-fasl-file-version
+-	  #+unicode _" Unicode" #-unicode ""))
++  (format nil "~X~A~A"
++          c:byte-fasl-file-version
++          #+unicode "-unicode" #-unicode ""
++          *lisp-implementation-version*))
+ 
+ (defun machine-instance ()
+   "Returns a string giving the name of the local machine."

diff --git a/dev-lisp/cmucl/files/21c-execstack-fixes.patch b/dev-lisp/cmucl/files/21c-execstack-fixes.patch
new file mode 100644
index 00000000..034848d6
--- /dev/null
+++ b/dev-lisp/cmucl/files/21c-execstack-fixes.patch
@@ -0,0 +1,118 @@
+diff -Naur work.old/src/lisp/alpha-assem.S work/src/lisp/alpha-assem.S
+--- work.old/src/lisp/alpha-assem.S	2003-03-06 11:13:09.000000000 -0300
++++ work/src/lisp/alpha-assem.S	2010-05-10 00:06:34.000000000 -0300
+@@ -297,3 +297,7 @@
+ function_end_breakpoint_end:
+ 
+ 
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+diff -Naur work.old/src/lisp/amd64-assem.S work/src/lisp/amd64-assem.S
+--- work.old/src/lisp/amd64-assem.S	2004-07-27 19:03:53.000000000 -0300
++++ work/src/lisp/amd64-assem.S	2010-05-10 00:06:34.000000000 -0300
+@@ -1051,3 +1051,7 @@
+ 	.end
+ 
+ #endif /* LINKAGE_TABLE */
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+diff -Naur work.old/src/lisp/backtrace.c work/src/lisp/backtrace.c
+--- work.old/src/lisp/backtrace.c	2009-06-11 13:04:01.000000000 -0300
++++ work/src/lisp/backtrace.c	2010-05-10 00:06:22.000000000 -0300
+@@ -3,6 +3,8 @@
+  * Simple backtrace facility.  More or less from Rob's lisp version.
+  */
+ 
++#include "os-common.h"
++
+ #include <stdio.h>
+ #include <signal.h>
+ #include "lisp.h"
+diff -Naur work.old/src/lisp/hppa-assem.S work/src/lisp/hppa-assem.S
+--- work.old/src/lisp/hppa-assem.S	2002-08-23 14:05:35.000000000 -0300
++++ work/src/lisp/hppa-assem.S	2010-05-10 00:06:34.000000000 -0300
+@@ -460,3 +460,7 @@
+ 
+ 	.export	function_end_breakpoint_end
+ function_end_breakpoint_end
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+diff -Naur work.old/src/lisp/linux-stubs.S work/src/lisp/linux-stubs.S
+--- work.old/src/lisp/linux-stubs.S	2005-08-17 00:40:16.000000000 -0300
++++ work/src/lisp/linux-stubs.S	2010-05-10 00:06:34.000000000 -0300
+@@ -995,3 +995,7 @@
+ /*  doe(yperr_string) */
+ /*  doe(ypprot_err) */
+ #endif /* defined(LINKAGE_TABLE) && !defined(__FreeBSD__) */
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+diff -Naur work.old/src/lisp/lisp.c work/src/lisp/lisp.c
+--- work.old/src/lisp/lisp.c	2009-07-13 16:41:54.000000000 -0300
++++ work/src/lisp/lisp.c	2010-05-10 00:05:55.000000000 -0300
+@@ -5,6 +5,9 @@
+  *
+  */
+ 
++#include "os-common.h"
++#include <time.h>
++
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <limits.h>
+diff -Naur work.old/src/lisp/mips-assem.S work/src/lisp/mips-assem.S
+--- work.old/src/lisp/mips-assem.S	2002-08-23 14:01:02.000000000 -0300
++++ work/src/lisp/mips-assem.S	2010-05-10 00:06:34.000000000 -0300
+@@ -402,3 +402,7 @@
+ 	move	v0, a1
+ 	j	_restore_state
+ 	.end	save_state
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+diff -Naur work.old/src/lisp/os-common.h work/src/lisp/os-common.h
+--- work.old/src/lisp/os-common.h	1969-12-31 21:00:00.000000000 -0300
++++ work/src/lisp/os-common.h	2010-05-10 00:06:22.000000000 -0300
+@@ -0,0 +1 @@
++char* convert_lisp_string(char *c_string, void *lisp_string, int len);
+diff -Naur work.old/src/lisp/ppc-assem.S work/src/lisp/ppc-assem.S
+--- work.old/src/lisp/ppc-assem.S	2006-02-25 01:35:58.000000000 -0300
++++ work/src/lisp/ppc-assem.S	2010-05-10 00:06:34.000000000 -0300
+@@ -721,3 +721,7 @@
+ 	SET_SIZE(fpu_restore)
+ 	
+ #endif
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+diff -Naur work.old/src/lisp/sparc-assem.S work/src/lisp/sparc-assem.S
+--- work.old/src/lisp/sparc-assem.S	2003-10-23 23:57:00.000000000 -0300
++++ work/src/lisp/sparc-assem.S	2010-05-10 00:06:34.000000000 -0300
+@@ -837,3 +837,7 @@
+  * End:
+  */						
+ 		
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif
+diff -Naur work.old/src/lisp/x86-assem.S work/src/lisp/x86-assem.S
+--- work.old/src/lisp/x86-assem.S	2008-12-24 02:36:40.000000000 -0200
++++ work/src/lisp/x86-assem.S	2010-05-10 00:06:34.000000000 -0300
+@@ -798,3 +798,7 @@
+ ENDFUNC(undefined_foreign_symbol_trap)
+ 
+ #endif /* LINKAGE_TABLE */
++
++#if defined(__linux__) && defined(__ELF__)
++.section .note.GNU-stack,"",%progbits
++#endif


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] proj/lisp:master commit in: dev-lisp/cmucl/files/, dev-lisp/cmucl/
@ 2018-05-03  8:55 José María Alonso
  0 siblings, 0 replies; 6+ messages in thread
From: José María Alonso @ 2018-05-03  8:55 UTC (permalink / raw
  To: gentoo-commits

commit:     9ef14aef1b2368b82e01ab4e46e2a05be7559913
Author:     Chema Alonso Josa <nimiux <AT> gentoo <DOT> org>
AuthorDate: Thu May  3 08:55:07 2018 +0000
Commit:     José María Alonso <nimiux <AT> gentoo <DOT> org>
CommitDate: Thu May  3 08:55:07 2018 +0000
URL:        https://gitweb.gentoo.org/proj/lisp.git/commit/?id=9ef14aef

dev-lisp/cmucl: Cleanup patches

 dev-lisp/cmucl/cmucl-21c.ebuild                          | 16 ++++++++--------
 .../21c-customize-lisp-implementation-version.patch      | 16 ----------------
 .../files/{21c-build.patch => cmucl-21c-build.patch}     |  0
 ...stack-fixes.patch => cmucl-21c-execstack-fixes.patch} |  0
 4 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/dev-lisp/cmucl/cmucl-21c.ebuild b/dev-lisp/cmucl/cmucl-21c.ebuild
index 15054747..e2175b10 100644
--- a/dev-lisp/cmucl/cmucl-21c.ebuild
+++ b/dev-lisp/cmucl/cmucl-21c.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
+
 inherit eutils toolchain-funcs multilib
 
 MY_PV=${PV:0:3}
@@ -28,9 +29,8 @@ S="${WORKDIR}"
 TARGET=linux-4
 
 src_prepare() {
-	eapply "${FILESDIR}"/${MY_PV}-execstack-fixes.patch
-	eapply "${FILESDIR}"/${MY_PV}-customize-lisp-implementation-version.patch
-	eapply "${FILESDIR}"/${MY_PV}-build.patch
+	eapply "${FILESDIR}"/${P}-execstack-fixes.patch
+	eapply "${FILESDIR}"/${P}-build.patch
 	eapply_user
 	#cp "${FILESDIR}"/os-common.h src/lisp/ || die
 	cp /usr/share/common-lisp/source/asdf/build/asdf.lisp src/contrib/asdf/ || die
@@ -39,7 +39,7 @@ src_prepare() {
 src_compile() {
 	local cmuopts buildimage
 
-	if use X; then
+	if use X ; then
 		cmuopts=""
 	else
 		cmuopts="-u"
@@ -61,7 +61,7 @@ src_compile() {
 (compile-file "modules:defsystem/defsystem")
 EOF
 
-	# documentation
+	# Documentation
 	if use doc; then
 		pushd src/docs/cmu-user > /dev/null || die "directory src/docs/cmu-user does not exist"
 		emake
@@ -86,7 +86,7 @@ src_install() {
 	if use source; then
 		# Necessary otherwise tar will fail
 		dodir /usr/share/common-lisp/source/${PN}
-		cd "${D}"/usr/share/common-lisp/source/${PN}
+		cd "${D}"/usr/share/common-lisp/source/${PN} || die
 		tar --strip-components 1 -xzpf "${WORKDIR}"/cmucl-src-${MY_PV}.tar.gz \
 			|| die "Cannot install sources"
 	fi
@@ -100,7 +100,7 @@ src_install() {
 	insinto /etc/common-lisp
 	doins "${FILESDIR}"/cmuclrc || die "Failed to install cmuclrc"
 
-	# documentation
+	# Documentation
 	dodoc doc/cmucl/README
 	if use doc; then
 		insinto /usr/share/doc/${PF}

diff --git a/dev-lisp/cmucl/files/21c-customize-lisp-implementation-version.patch b/dev-lisp/cmucl/files/21c-customize-lisp-implementation-version.patch
deleted file mode 100644
index 8fc9278a..00000000
--- a/dev-lisp/cmucl/files/21c-customize-lisp-implementation-version.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur cmucl.orig/src/code/misc.lisp cmucl/src/code/misc.lisp
---- cmucl.orig/src/code/misc.lisp	2011-10-25 05:31:39.000000000 +0200
-+++ cmucl/src/code/misc.lisp	2012-01-31 21:46:49.441273068 +0100
-@@ -187,8 +187,10 @@
- 
- (defun lisp-implementation-version ()
-   "Returns a string describing the implementation version."
--  (format nil "~A (~X~A)" *lisp-implementation-version* c:byte-fasl-file-version
--	  #+unicode _" Unicode" #-unicode ""))
-+  (format nil "~X~A~A"
-+          c:byte-fasl-file-version
-+          #+unicode "-unicode" #-unicode ""
-+          *lisp-implementation-version*))
- 
- (defun machine-instance ()
-   "Returns a string giving the name of the local machine."

diff --git a/dev-lisp/cmucl/files/21c-build.patch b/dev-lisp/cmucl/files/cmucl-21c-build.patch
similarity index 100%
rename from dev-lisp/cmucl/files/21c-build.patch
rename to dev-lisp/cmucl/files/cmucl-21c-build.patch

diff --git a/dev-lisp/cmucl/files/21c-execstack-fixes.patch b/dev-lisp/cmucl/files/cmucl-21c-execstack-fixes.patch
similarity index 100%
rename from dev-lisp/cmucl/files/21c-execstack-fixes.patch
rename to dev-lisp/cmucl/files/cmucl-21c-execstack-fixes.patch


^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-05-03  8:55 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-02 21:19 [gentoo-commits] proj/lisp:master commit in: dev-lisp/cmucl/files/, dev-lisp/cmucl/ José María Alonso
  -- strict thread matches above, loose matches on Subject: below --
2018-05-03  8:55 José María Alonso
2018-05-02 21:22 José María Alonso
2013-04-04 18:23 Stelian Ionescu
2012-01-31 21:24 Stelian Ionescu
2011-06-21 12:03 Stelian Ionescu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox