[gentoo-commits] proj/lisp:master commit in: dev-lisp/cmucl/, dev-lisp/cmucl/files/
commit: 507f82c06c6838305c05b8bc9c77e7ccbeca53b3
Author: Chema Alonso Josa gentoo org>
AuthorDate: Sun Oct 8 20:16:19 2017 +
Commit: José María Alonso gentoo org>
CommitDate: Sun Oct 8 20:16:19 2017 +
URL:https://gitweb.gentoo.org/proj/lisp.git/commit/?id=507f82c0
dev-lisp/cmucl: Syns with gentoo repository
.../{cmucl-20d-r3.ebuild => cmucl-20e.ebuild} | 37 +++
.../{cmucl-20d-r3.ebuild => cmucl-21a.ebuild} | 32 +
...0e-customize-lisp-implementation-version.patch} | 0
...stack-fixes.patch => 20e-execstack-fixes.patch} | 0
dev-lisp/cmucl/files/21a-build.patch | 22
...1a-customize-lisp-implementation-version.patch} | 0
...stack-fixes.patch => 21a-execstack-fixes.patch} | 0
dev-lisp/cmucl/files/cmuclrc | 6 ++--
.../cmucl/files/fix-man-and-doc-installation.patch | 42 --
dev-lisp/cmucl/files/site-init.lisp.in | 9 +++--
dev-lisp/cmucl/metadata.xml| 39
11 files changed, 110 insertions(+), 77 deletions(-)
diff --git a/dev-lisp/cmucl/cmucl-20d-r3.ebuild
b/dev-lisp/cmucl/cmucl-20e.ebuild
similarity index 82%
copy from dev-lisp/cmucl/cmucl-20d-r3.ebuild
copy to dev-lisp/cmucl/cmucl-20e.ebuild
index a59a9e1d..9e122b9a 100644
--- a/dev-lisp/cmucl/cmucl-20d-r3.ebuild
+++ b/dev-lisp/cmucl/cmucl-20e.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-
-inherit eutils glo-utils toolchain-funcs
+EAPI=5
+inherit eutils toolchain-funcs multilib
MY_PV=${PV:0:3}
@@ -11,12 +10,11 @@ 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="X source sse2"
+KEYWORDS="x86"
+IUSE="X source cpu_flags_x86_sse2"
CDEPEND=">=dev-lisp/asdf-2.33-r3:=
x11-libs/motif:0"
@@ -29,16 +27,27 @@ S="${WORKDIR}"
TARGET=linux-4
src_prepare() {
- eapply "${FILESDIR}"/${MY_PV}-execstack-fixes.patch
- eapply
"${FILESDIR}"/${MY_PV}-customize-lisp-implementation-version.patch
+ 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
- eapply_user
}
src_compile() {
- local cmufpu=$(glo_usev sse2 sse2 x87)
- local cmuopts="$(glo_usev !X -u) -f ${cmufpu}"
+ 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"
@@ -62,7 +71,7 @@ src_install() {
|| die "Cannot build installation archive"
# Necessary otherwise tar will fail
dodir /usr
- pushd "${D}"/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
@@ -76,7 +85,7 @@ src_install() {
tar --strip-components 1 -xzpf
"${WORKDIR}"/cmucl-src-${MY_PV}.tar.gz \
|| die "Cannot install sources"
fi
- popd
+ popd > /dev/null
# Install site config file
sed "s,@PF@,${PF},g ; s,@VERSION@,$(date +%F),g" \
diff --git a/dev-lisp/cmucl/cmucl-20d-r3.ebuild
b/dev-lisp/cmucl/cmucl-21a.ebuild
similarity index 82%
rename from dev-lisp/cmucl/cmucl-20d-r3.ebuild
rename to dev-lisp/cmucl/cmucl-21a.ebuild
index a59a9e1d..f3f9b830 100644
--- a/dev-lisp/cmucl/cmucl-20d-r3.ebuild
+++ b/dev-lisp/cmucl/cmucl-21a.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-
-inherit eutils glo-utils toolchain-funcs
+EAPI=5
+inherit eutils toolchain-funcs multilib
MY_PV=${PV:0:3}
@@ -11,12 +10,11 @@ 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-
[gentoo-commits] proj/lisp:master commit in: dev-lisp/cmucl/, dev-lisp/cmucl/files/
commit: 3e2c9538f3452f7d8fdea1de3bf92cc24c0bf750
Author: Chema Alonso Josa gentoo org>
AuthorDate: Sat Jun 2 07:58:14 2018 +
Commit: José María Alonso gentoo org>
CommitDate: Sat Jun 2 07:58:14 2018 +
URL:https://gitweb.gentoo.org/proj/lisp.git/commit/?id=3e2c9538
dev-lisp/cmucl: Drop old version
dev-lisp/cmucl/cmucl-21a.ebuild| 92
dev-lisp/cmucl/files/21a-build.patch | 22
...21a-customize-lisp-implementation-version.patch | 16 ---
dev-lisp/cmucl/files/21a-execstack-fixes.patch | 118 -
4 files changed, 248 deletions(-)
diff --git a/dev-lisp/cmucl/cmucl-21a.ebuild b/dev-lisp/cmucl/cmucl-21a.ebuild
deleted file mode 100644
index f3f9b830..
--- a/dev-lisp/cmucl/cmucl-21a.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2016 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"
-
-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
- epatch "${FILESDIR}"/${MY_PV}-build.patch
-
- 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
-}
-
-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/21a-build.patch
b/dev-lisp/cmucl/files/21a-build.patch
deleted file mode 100644
index 46423410..
--- a/dev-lisp/cmucl/files/21a-build.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -r -U2 21a.orig/bin/build.sh 21a/bin/build.sh
21a.orig/bin/build.sh 2015-05-19 07:42:40.0 +0600
-+++ 21a/bin/build.sh 2016-04-03 20:54:08.597016537 +0600
-@@ -40,5 +40,5 @@
- ENABLE4="yes"
-
--version=20f
-+version=21a
- 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
