| 1 |
commit: 9ef14aef1b2368b82e01ab4e46e2a05be7559913 |
| 2 |
Author: Chema Alonso Josa <nimiux <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu May 3 08:55:07 2018 +0000 |
| 4 |
Commit: José María Alonso <nimiux <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu May 3 08:55:07 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/lisp.git/commit/?id=9ef14aef |
| 7 |
|
| 8 |
dev-lisp/cmucl: Cleanup patches |
| 9 |
|
| 10 |
dev-lisp/cmucl/cmucl-21c.ebuild | 16 ++++++++-------- |
| 11 |
.../21c-customize-lisp-implementation-version.patch | 16 ---------------- |
| 12 |
.../files/{21c-build.patch => cmucl-21c-build.patch} | 0 |
| 13 |
...stack-fixes.patch => cmucl-21c-execstack-fixes.patch} | 0 |
| 14 |
4 files changed, 8 insertions(+), 24 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-lisp/cmucl/cmucl-21c.ebuild b/dev-lisp/cmucl/cmucl-21c.ebuild |
| 17 |
index 15054747..e2175b10 100644 |
| 18 |
--- a/dev-lisp/cmucl/cmucl-21c.ebuild |
| 19 |
+++ b/dev-lisp/cmucl/cmucl-21c.ebuild |
| 20 |
@@ -1,7 +1,8 @@ |
| 21 |
-# Copyright 1999-2017 Gentoo Foundation |
| 22 |
+# Copyright 1999-2018 Gentoo Foundation |
| 23 |
# Distributed under the terms of the GNU General Public License v2 |
| 24 |
|
| 25 |
EAPI=6 |
| 26 |
+ |
| 27 |
inherit eutils toolchain-funcs multilib |
| 28 |
|
| 29 |
MY_PV=${PV:0:3} |
| 30 |
@@ -28,9 +29,8 @@ S="${WORKDIR}" |
| 31 |
TARGET=linux-4 |
| 32 |
|
| 33 |
src_prepare() { |
| 34 |
- eapply "${FILESDIR}"/${MY_PV}-execstack-fixes.patch |
| 35 |
- eapply "${FILESDIR}"/${MY_PV}-customize-lisp-implementation-version.patch |
| 36 |
- eapply "${FILESDIR}"/${MY_PV}-build.patch |
| 37 |
+ eapply "${FILESDIR}"/${P}-execstack-fixes.patch |
| 38 |
+ eapply "${FILESDIR}"/${P}-build.patch |
| 39 |
eapply_user |
| 40 |
#cp "${FILESDIR}"/os-common.h src/lisp/ || die |
| 41 |
cp /usr/share/common-lisp/source/asdf/build/asdf.lisp src/contrib/asdf/ || die |
| 42 |
@@ -39,7 +39,7 @@ src_prepare() { |
| 43 |
src_compile() { |
| 44 |
local cmuopts buildimage |
| 45 |
|
| 46 |
- if use X; then |
| 47 |
+ if use X ; then |
| 48 |
cmuopts="" |
| 49 |
else |
| 50 |
cmuopts="-u" |
| 51 |
@@ -61,7 +61,7 @@ src_compile() { |
| 52 |
(compile-file "modules:defsystem/defsystem") |
| 53 |
EOF |
| 54 |
|
| 55 |
- # documentation |
| 56 |
+ # Documentation |
| 57 |
if use doc; then |
| 58 |
pushd src/docs/cmu-user > /dev/null || die "directory src/docs/cmu-user does not exist" |
| 59 |
emake |
| 60 |
@@ -86,7 +86,7 @@ src_install() { |
| 61 |
if use source; then |
| 62 |
# Necessary otherwise tar will fail |
| 63 |
dodir /usr/share/common-lisp/source/${PN} |
| 64 |
- cd "${D}"/usr/share/common-lisp/source/${PN} |
| 65 |
+ cd "${D}"/usr/share/common-lisp/source/${PN} || die |
| 66 |
tar --strip-components 1 -xzpf "${WORKDIR}"/cmucl-src-${MY_PV}.tar.gz \ |
| 67 |
|| die "Cannot install sources" |
| 68 |
fi |
| 69 |
@@ -100,7 +100,7 @@ src_install() { |
| 70 |
insinto /etc/common-lisp |
| 71 |
doins "${FILESDIR}"/cmuclrc || die "Failed to install cmuclrc" |
| 72 |
|
| 73 |
- # documentation |
| 74 |
+ # Documentation |
| 75 |
dodoc doc/cmucl/README |
| 76 |
if use doc; then |
| 77 |
insinto /usr/share/doc/${PF} |
| 78 |
|
| 79 |
diff --git a/dev-lisp/cmucl/files/21c-customize-lisp-implementation-version.patch b/dev-lisp/cmucl/files/21c-customize-lisp-implementation-version.patch |
| 80 |
deleted file mode 100644 |
| 81 |
index 8fc9278a..00000000 |
| 82 |
--- a/dev-lisp/cmucl/files/21c-customize-lisp-implementation-version.patch |
| 83 |
+++ /dev/null |
| 84 |
@@ -1,16 +0,0 @@ |
| 85 |
-diff -ur cmucl.orig/src/code/misc.lisp cmucl/src/code/misc.lisp |
| 86 |
---- cmucl.orig/src/code/misc.lisp 2011-10-25 05:31:39.000000000 +0200 |
| 87 |
-+++ cmucl/src/code/misc.lisp 2012-01-31 21:46:49.441273068 +0100 |
| 88 |
-@@ -187,8 +187,10 @@ |
| 89 |
- |
| 90 |
- (defun lisp-implementation-version () |
| 91 |
- "Returns a string describing the implementation version." |
| 92 |
-- (format nil "~A (~X~A)" *lisp-implementation-version* c:byte-fasl-file-version |
| 93 |
-- #+unicode _" Unicode" #-unicode "")) |
| 94 |
-+ (format nil "~X~A~A" |
| 95 |
-+ c:byte-fasl-file-version |
| 96 |
-+ #+unicode "-unicode" #-unicode "" |
| 97 |
-+ *lisp-implementation-version*)) |
| 98 |
- |
| 99 |
- (defun machine-instance () |
| 100 |
- "Returns a string giving the name of the local machine." |
| 101 |
|
| 102 |
diff --git a/dev-lisp/cmucl/files/21c-build.patch b/dev-lisp/cmucl/files/cmucl-21c-build.patch |
| 103 |
similarity index 100% |
| 104 |
rename from dev-lisp/cmucl/files/21c-build.patch |
| 105 |
rename to dev-lisp/cmucl/files/cmucl-21c-build.patch |
| 106 |
|
| 107 |
diff --git a/dev-lisp/cmucl/files/21c-execstack-fixes.patch b/dev-lisp/cmucl/files/cmucl-21c-execstack-fixes.patch |
| 108 |
similarity index 100% |
| 109 |
rename from dev-lisp/cmucl/files/21c-execstack-fixes.patch |
| 110 |
rename to dev-lisp/cmucl/files/cmucl-21c-execstack-fixes.patch |
Archives