diff options
author | Pacho Ramos <pacho@gentoo.org> | 2015-05-23 15:18:39 +0000 |
---|---|---|
committer | Pacho Ramos <pacho@gentoo.org> | 2015-05-23 15:18:39 +0000 |
commit | d8b1877a6a1c79d2abdfe865f5446a3b2196e16b (patch) | |
tree | bdf48f360547fa99a127197b51833a638844744c /dev-lisp | |
parent | x86 stable wrt bug #526744 (diff) | |
download | gentoo-2-d8b1877a6a1c79d2abdfe865f5446a3b2196e16b.tar.gz gentoo-2-d8b1877a6a1c79d2abdfe865f5446a3b2196e16b.tar.bz2 gentoo-2-d8b1877a6a1c79d2abdfe865f5446a3b2196e16b.zip |
Drop old
(Portage version: 2.2.19/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'dev-lisp')
22 files changed, 15 insertions, 1376 deletions
diff --git a/dev-lisp/cmucl/ChangeLog b/dev-lisp/cmucl/ChangeLog index 70b908908029..bdd692501730 100644 --- a/dev-lisp/cmucl/ChangeLog +++ b/dev-lisp/cmucl/ChangeLog @@ -1,6 +1,20 @@ # ChangeLog for dev-lisp/cmucl # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/ChangeLog,v 1.45 2015/05/23 15:16:34 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/ChangeLog,v 1.46 2015/05/23 15:18:39 pacho Exp $ + + 23 May 2015; Pacho Ramos <pacho@gentoo.org> -cmucl-19c.ebuild, + -cmucl-19d_p2.ebuild, -cmucl-20a.ebuild, -cmucl-20b_p001.ebuild, + -cmucl-20d-r3.ebuild, -files/19c/README.Gentoo, -files/19c/cmucl.sh, + -files/19c/herald-save.lisp-gentoo.patch, -files/19c/install-clc.lisp, + -files/19c/site-init.lisp.in, -files/19d-cmucl-patch-002.patch, + -files/19d-gentoo.patch, -files/20a-multiplefixes.patch, + -files/20a-patch000.patch, + -files/20b-customize-lisp-implementation-version.patch, + -files/20b-execstack-fixes.patch, -files/20b-nositeinit-build.patch, + -files/20b-patch001.patch, + -files/20d-customize-lisp-implementation-version.patch, + -files/20d-execstack-fixes.patch, -files/fix-man-and-doc-installation.patch: + Drop old 23 May 2015; Pacho Ramos <pacho@gentoo.org> cmucl-20e.ebuild: x86 stable wrt bug #526744 diff --git a/dev-lisp/cmucl/cmucl-19c.ebuild b/dev-lisp/cmucl/cmucl-19c.ebuild deleted file mode 100644 index 207264949276..000000000000 --- a/dev-lisp/cmucl/cmucl-19c.ebuild +++ /dev/null @@ -1,162 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/cmucl-19c.ebuild,v 1.11 2012/10/24 19:07:00 ulm Exp $ - -EAPI=1 - -inherit common-lisp-common-2 eutils toolchain-funcs - -DEB_PV=1 -MY_PV=${PV}-release-20051115 - -DESCRIPTION="CMU Common Lisp is an implementation of ANSI Common Lisp" -HOMEPAGE="http://www.cons.org/cmucl/ - http://packages.debian.org/unstable/devel/cmucl.html" -SRC_URI="mirror://gentoo/cmucl_${MY_PV}.orig.tar.gz - mirror://gentoo/cmucl_${MY_PV}-${DEB_PV}.diff.gz - mirror://gentoo/${P}-x86-linux.tar.bz2" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="x86" -IUSE="doc nosource" - -DEPEND=">=dev-lisp/common-lisp-controller-4 - doc? ( virtual/latex-base ) - >=x11-libs/motif-2.3:0 - sys-devel/bc" - -S=${WORKDIR}/cmucl-${MY_PV}.orig - -src_unpack() { - unpack ${A} - epatch cmucl_${MY_PV}-${DEB_PV}.diff - epatch "${FILESDIR}/${PV}/herald-save.lisp-gentoo.patch" - - find "${S}" -type f \( -name \*.sh -o -name linux-nm \) \ - -exec chmod +x '{}' \; -} - -src_compile() { - export SANDBOX_ON=0 - - sed -i -e "s,CC = .*,CC = $(tc-getCC),g" \ - src/lisp/Config.linux_gencgc - - PATH=${WORKDIR}/bin:$PATH CMUCLCORE=${WORKDIR}/lib/cmucl/lib/lisp.core make || die - - if use doc; then - make -C src/docs - fi -} - -src_install() { - insinto /usr/lib/cmucl/include - doins src/lisp/*.h target/lisp/*.h target/lisp/*.map target/lisp/*.nm - insinto /usr/lib/cmucl - cp target/lisp/lisp.core lisp-dist.core - doins lisp-dist.core - - dodoc target/lisp/lisp.{nm,map} - doman src/general-info/{cmucl,lisp}.1 - - dobin target/lisp/lisp - dobin own-work/Demos/lisp-start - - insinto /usr/lib/cmucl - doins own-work/install-clc.lisp - exeinto /usr/lib/common-lisp/bin - newexe own-work/cmucl-script.sh cmucl.sh - - insinto /etc/common-lisp/cmucl - sed "s,@PF@,${PF},g" <"${FILESDIR}/${PV}/site-init.lisp.in" >site-init.lisp - doins site-init.lisp - dosym /etc/common-lisp/cmucl/site-init.lisp /usr/lib/cmucl/site-init.lisp - - dodir /etc/env.d - cat >"${D}"/etc/env.d/50cmucl <<EOF -# CMUCLLIB=/usr/lib/cmucl -EOF - [ -f /etc/lisp-config.lisp ] || touch "${D}"/etc/lisp-config.lisp - - insinto /usr/share/doc/${P}/html/Basic-tutorial - doins own-work/tutorials/Basic-tutorial/* - insinto /usr/share/doc/${P}/html/Clos - doins own-work/tutorials/Clos/* - docinto notes - dodoc own-work/tutorials/notes/* - - insinto /usr/lib/cmucl - doins own-work/hemlock11.* - - if use doc; then - dodoc src/docs/*/*.{ps,pdf} - fi - - exeinto /usr/lib/cmucl - doexe target/motif/server/motifd - - # subsystems - insinto /usr/lib/cmucl/subsystems/ - doins target/interface/clm-library.x86f \ - target/pcl/simple-streams-library.x86f \ - target/pcl/iodefs-library.x86f \ - target/pcl/gray-compat-library.x86f \ - target/hemlock/hemlock-library.x86f \ - target/pcl/gray-streams-library.x86f \ - target/clx/clx-library.x86f - - # Previously installed from dev-lisp/cmucl-source - if ! use nosource; then - dodir /usr/share/common-lisp/source/cmucl - (cd src ; find . -name \*.lisp -and -type f | tar --create --file=- --files-from=- ) |\ - tar --extract --file=- -C "${D}"/usr/share/common-lisp/source/cmucl - dodir /usr/share/common-lisp/systems - fi - - # cmucl-graystream - insinto /usr/share/common-lisp/source/cmucl-graystream - doins src/pcl/gray-streams* own-work/cmucl-graystream.asd - dosym /usr/share/common-lisp/source/cmucl-graystream/cmucl-graystream.asd \ - /usr/share/common-lisp/systems/ - - # cmucl-clx - insinto /usr/share/common-lisp/source/cmucl-clx - cp -r src/clx/*.lisp own-work/cmucl-clx.asd \ - src/code/clx-ext.lisp \ - src/hemlock/charmacs.lisp \ - src/hemlock/key-event.lisp \ - src/hemlock/keysym-defs.lisp \ - "${D}"/usr/share/common-lisp/source/cmucl-clx - insinto /usr/share/common-lisp/source/cmucl-clx/debug - doins src/clx/debug/*.lisp - insinto /usr/share/common-lisp/source/cmucl-clx/demo - doins src/clx/demo/*.lisp - insinto /usr/share/common-lisp/source/cmucl-clx/test - doins src/clx/test/*.lisp -# find ${D}/usr/share/common-lisp/source/cmucl-clx -type f -print0 | xargs -0 chmod 644 -# find ${D}/usr/share/common-lisp/source/cmucl-clx -type d -print0 | xargs -0 chmod 755 - dosym /usr/share/common-lisp/source/cmucl-clx/cmucl-clx.asd \ - /usr/share/common-lisp/systems/ - - keepdir /usr/lib/common-lisp/cmucl - impl-save-timestamp-hack cmucl || die -} - -pkg_postinst() { - standard-impl-postinst cmucl - register-common-lisp-source cmucl-graystream - register-common-lisp-source cmucl-clx -} - -pkg_prerm() { - standard-impl-postrm cmucl /usr/bin/lisp - unregister-common-lisp-source cmucl-graystream - unregister-common-lisp-source cmucl-clx -} - -pkg_postrm() { - if [ ! -x /usr/bin/lisp ]; then - rm -rf /usr/lib/cmucl/ || die - fi -} diff --git a/dev-lisp/cmucl/cmucl-19d_p2.ebuild b/dev-lisp/cmucl/cmucl-19d_p2.ebuild deleted file mode 100644 index 0ed1556bab7f..000000000000 --- a/dev-lisp/cmucl/cmucl-19d_p2.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/cmucl-19d_p2.ebuild,v 1.6 2012/10/24 19:07:00 ulm Exp $ - -EAPI=1 - -inherit common-lisp-common-3 eutils toolchain-funcs - -MY_PV=${PV:0:3} -MY_PVL=${PV} - -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="" - -DEPEND=">=x11-libs/motif-2.3:0 - sys-devel/bc" - -S=${WORKDIR} - -src_unpack() { - unpack ${A} - epatch "${FILESDIR}/${MY_PV}-gentoo.patch" - epatch "${FILESDIR}/${MY_PV}-cmucl-patch-002.patch" - find "${S}" -type f \( -name \*.sh -o -name linux-nm \) \ - -exec chmod +x '{}' \; - sed -i -e "s,CC = .*,CC = $(tc-getCC),g" src/lisp/Config.linux_gencgc - sed -i -e 's,"time","",g' src/tools/build.sh - sed -i -e "s,@CFLAGS@,$CFLAGS,g" src/lisp/Config.linux_gencgc src/motif/server/Config.x86 -} - -src_compile() { - export SANDBOX_ON=0 - src/tools/build.sh -C "" -o "bin/lisp -core lib/cmucl/lib/lisp.core -batch -noinit -nositeinit" || die -} - -src_install() { - src/tools/make-dist.sh -g -G root -O root build-4 ${MY_PVL} x86 linux - dodir /usr/share/doc - for i in cmucl-${MY_PVL}-x86-linux.{,extra.}tar.gz; do - tar xzpf $i -C "${D}"/usr - done - mv "${D}"/usr/doc "${D}"/usr/share/doc/${PF} - mv "${D}"/usr/man "${D}"/usr/share/ - impl-save-timestamp-hack cmucl || die -} - -pkg_postinst() { - standard-impl-postinst cmucl -} - -pkg_postrm() { - standard-impl-postrm cmucl /usr/bin/lisp -} - -# pkg_postrm() { -# if [ ! -x /usr/bin/lisp ]; then -# rm -rf /usr/lib/cmucl/ || die -# fi -# } diff --git a/dev-lisp/cmucl/cmucl-20a.ebuild b/dev-lisp/cmucl/cmucl-20a.ebuild deleted file mode 100644 index e4093b41c7b3..000000000000 --- a/dev-lisp/cmucl/cmucl-20a.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/cmucl-20a.ebuild,v 1.7 2015/01/28 19:40:59 mgorny Exp $ - -EAPI="3" - -inherit eutils multilib 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="X source cpu_flags_x86_sse2" - -RDEPEND=">=x11-libs/motif-2.3:0" -DEPEND="${RDEPEND} - sys-devel/bc" -PDEPEND="dev-lisp/gentoo-init" - -S="${WORKDIR}" - -src_prepare() { - epatch "${FILESDIR}"/fix-man-and-doc-installation.patch - epatch "${FILESDIR}"/${MY_PV}-patch000.patch - epatch "${FILESDIR}"/${MY_PV}-multiplefixes.patch -} - -src_compile() { - local cfpu="sse2" - if ! use cpu_flags_x86_sse2; then - cfpu="x87" - fi - - einfo ${cfpu} - - local copts="-u" - - if use X; then - copts="" - fi - - copts+=" -f ${cfpu}" - - local buildimage="bin/lisp -core lib/cmucl/lib/lisp-${cfpu}.core -batch -noinit -nositeinit" - env CC="$(tc-getCC)" src/tools/build.sh -C "" -o "${buildimage}" ${copts} || 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" - - dodir /usr || die "dodir failed" - - tar xzpf cmucl-${MY_PV}-x86-linux.tar.gz -C "${D}"/usr || die "Cannot install main system" - if use X ; then - tar xzpf cmucl-${MY_PV}-x86-linux.extra.tar.gz -C "${D}"/usr || die "Cannot install extra files" - fi - if use source; then - dodir /usr/share/common-lisp/source/${PN} || die "dodir failed" - tar --strip-components 1 -xzpf cmucl-src-${MY_PV}.tar.gz \ - -C "${D}"/usr/share/common-lisp/source/${PN} \ - || die "tar failed" - fi - - # 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 "sed failed" - insinto /etc - doins "${FILESDIR}"/cmuclrc || die "doins failed" -} diff --git a/dev-lisp/cmucl/cmucl-20b_p001.ebuild b/dev-lisp/cmucl/cmucl-20b_p001.ebuild deleted file mode 100644 index c269380c4312..000000000000 --- a/dev-lisp/cmucl/cmucl-20b_p001.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/cmucl-20b_p001.ebuild,v 1.5 2015/01/28 19:40:59 mgorny Exp $ - -EAPI=3 -inherit eutils multilib 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" - -LICENSE="public-domain" -SLOT="0" -KEYWORDS="~x86" -IUSE="X source cpu_flags_x86_sse2" - -RDEPEND="x11-libs/motif" -DEPEND="${RDEPEND} - sys-devel/bc" -PDEPEND="dev-lisp/gentoo-init" - -S="${WORKDIR}" - -# glo_usev flagname [<if_yes> [<if_no>]] -# If $(use FLAGNAME) return true, echo IF_YES to standard output, -# otherwise echo IF_NO. IF_YES defaults to FLAGNAME if not specified -glo_usev() { - if [[ $# < 1 || $# > 3 ]]; then - echo "Usage: ${0} flag [if_yes [if_no]]" - die "${0}: wrong number of arguments: $#" - fi - local if_yes="${2:-${1}}" if_no="${3}" - if use ${1} ; then - printf "%s" "${if_yes}" - return 0 - else - printf "%s" "${if_no}" - return 1 - fi -} - -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 cpu_flags_x86_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" - insinto /etc - doins "${FILESDIR}"/cmuclrc || die "Failed to install cmuclrc" -} diff --git a/dev-lisp/cmucl/cmucl-20d-r3.ebuild b/dev-lisp/cmucl/cmucl-20d-r3.ebuild deleted file mode 100644 index dcd4d7abc076..000000000000 --- a/dev-lisp/cmucl/cmucl-20d-r3.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/cmucl-20d-r3.ebuild,v 1.3 2015/01/28 19:40:59 mgorny Exp $ - -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" -RESTRICT="mirror" - -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 - 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" - insinto /etc/common-lisp - doins "${FILESDIR}"/cmuclrc || die "Failed to install cmuclrc" -} diff --git a/dev-lisp/cmucl/files/19c/README.Gentoo b/dev-lisp/cmucl/files/19c/README.Gentoo deleted file mode 100644 index 885807587fb5..000000000000 --- a/dev-lisp/cmucl/files/19c/README.Gentoo +++ /dev/null @@ -1,31 +0,0 @@ - -* README.Gentoo -- Gentoo Specific Notes for dev-lisp/cmucl - -** About dev-lisp/cmucl - -The dev-lisp/cmucl ebuild in portage aim to provide a port of -Debian's package of CMUCL. Thus the Gentoo CMUCL port should be -binary compatible with the Debian port. - -** Linux Miscellaneous Binary Support - -You can have your compiled Lisp .x86f files automatically executed -like any other binary by executing the following command: - - echo ':lisp:E::x86f::/usr/bin/lisp-start:' \ - >/proc/sys/fs/binfmt_misc/register - -Note: you need kernel support for this. A good place to put the -above command is in your /etc/conf.d/localstart. - -** Credit - -This Gentoo package, like many other Gentoo packages in the dev-lisp -category, benifit from the Debian Project's work. - - -- Matthew Kennedy <mkennedy@gentoo.org> - - -Local Variables: *** -mode: outline *** -End: *** diff --git a/dev-lisp/cmucl/files/19c/cmucl.sh b/dev-lisp/cmucl/files/19c/cmucl.sh deleted file mode 100644 index 16772da268f0..000000000000 --- a/dev-lisp/cmucl/files/19c/cmucl.sh +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/sh - -if [ ! -f /usr/share/common-lisp/source/common-lisp-controller/common-lisp-controller.lisp ] ; then - cat <<EOF -$0: cannot find the common-lisp-controller source. -EOF - exit 0 -fi - -IMAGE=/usr/lib/cmucl/lisp.core -DIR=cmucl - -case $1 in - rebuild) - echo $0 rebuilding... - shift - while [ ! -z "$1" ] ; do - echo rebuilding $1 - /usr/bin/lisp -core $IMAGE -eval " -(let ((*gc-verbose* nil) - (*compile-print* nil) - (*compile-progress* nil) - (*compile-verbose* nil) - (*require-verbose* nil) - (*load-verbose* nil)) - (load \"/etc/common-lisp/cmucl/site-init.lisp\")) -(let ((*gc-verbose* nil) - (*compile-print* t) - (*compile-progress* nil) - (*compile-verbose* t) - (*require-verbose* t) - (*load-verbose* t) - (mk::*load-source-if-no-binary* nil) - (mk::*bother-user-if-no-binary* nil) - (mk::*compile-during-load* t)) - - (handler-case - (progn - (with-compilation-unit (:optimize '((inhibit-warnings 3))) - (common-lisp-controller:compile-library :$1)) - (unix:unix-exit 0)) - (error (e) - (ignore-errors (format t \"~&Built Error: ~A~%\" e)) - (finish-output) - (unix:unix-exit 1)))))" -nositeinit -noinit -batch -quiet || exit 1 - shift - done - ;; - remove) - echo $0 removing packages... - shift - while [ ! -z "$1" ] ; do - rm -rf "/usr/lib/common-lisp/$DIR/$1" - shift - done - rmdir /usr/lib/common-lisp/$DIR 2> /dev/null - ;; - install-defsystem|install-clc) - echo installing the clc... - ( cd /usr/lib/cmucl - [ -f $IMAGE ] && rm -f $IMAGE - /usr/bin/lisp \ - -core ${IMAGE%.core}-dist.core -load /usr/lib/cmucl/install-clc.lisp \ - -nositeinit -noinit -batch -quiet && \ - mv new-lisp.core $IMAGE || (echo FAILED ; ln ${IMAGE%.core}-dist.core $IMAGE ) ) - ;; - remove-defsystem|remove-clc) - [ -f $IMAGE ] && rm -f $IMAGE - ;; - make-user-image) - if [ ! -f $1 ] ; then - echo Cannot find file $1 to load and dump! - exit 321 - fi - /usr/bin/lisp -core $IMAGE -eval " -(load \"$1\") - ;; - ;; Enable the garbage collector. But first fake it into thinking that - ;; we don't need to garbage collect. The save-lisp is going to call - ;; purify so any garbage will be collected then. -#-gengc (setf lisp::*need-to-collect-garbage* nil) -(gc-on) - ;; - ;; Save the lisp. -(setf ext:*batch-mode* nil) -(save-lisp #p\"home:lisp.core\")" -nositeinit -noinit -batch -quiet && echo New image created - ;; - *) - echo $0 unkown command $1 - echo known commands: install-clc, remove-clc,rebuild and remove - exit 1 - ;; -esac - -exit 0 diff --git a/dev-lisp/cmucl/files/19c/herald-save.lisp-gentoo.patch b/dev-lisp/cmucl/files/19c/herald-save.lisp-gentoo.patch deleted file mode 100644 index adecda7f3e4f..000000000000 --- a/dev-lisp/cmucl/files/19c/herald-save.lisp-gentoo.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -ur cmucl-19c-release-20051115.orig.orig/src/code/save.lisp cmucl-19c-release-20051115.orig/src/code/save.lisp ---- cmucl-19c-release-20051115.orig.orig/src/code/save.lisp 2005-12-07 12:27:38.000000000 -0600 -+++ cmucl-19c-release-20051115.orig/src/code/save.lisp 2005-12-07 12:29:30.000000000 -0600 -@@ -297,11 +297,9 @@ - )) - - (setf (getf *herald-items* :bugs) -- '("For support see http://www.cons.org/cmucl/support.html Send bug reports to the debian BTS." -- terpri -- "or to " -- "pvaneynd@debian.org" terpri -- "type (help) for help, (quit) to exit, and (demo) to see the demos" terpri -+ '("For support see http://www.cons.org/cmucl/support.html" terpri -+ "Send bug reports to http://bugs.gentoo.org" terpri -+ "Type (help) for help or (quit) to exit." terpri - terpri - "Loaded subsystems:")) - diff --git a/dev-lisp/cmucl/files/19c/install-clc.lisp b/dev-lisp/cmucl/files/19c/install-clc.lisp deleted file mode 100644 index 23642b16ffee..000000000000 --- a/dev-lisp/cmucl/files/19c/install-clc.lisp +++ /dev/null @@ -1,55 +0,0 @@ -;;; -*- Mode: LISP; Package: CL-USER -*- -;;; -;;; Copyright Peter Van Eynde, 2001 -;;; -;;; License: LGPL v2 -;;; -(in-package "COMMON-LISP-USER") - -(unless (ignore-errors - (load "/usr/share/common-lisp/source/common-lisp-controller/common-lisp-controller.lisp")) - (unix:unix-exit 1)) - -;; (unless (ignore-errors - (common-lisp-controller:init-common-lisp-controller - "/usr/lib/common-lisp/cmucl/" - :version 3) -;; t) -;; (format t "~%Error during init of common-lisp-controller~%") -;; (unix:unix-exit 1)) - -(in-package :common-lisp-controller) - -(defun send-clc-command (command package) - (let ((process - (ext:run-program "/usr/bin/clc-send-command" - (list - (ecase command - (:recompile "recompile") - (:remove "remove")) - (format nil "~A" package) - "cmucl" - "--quiet") - :wait t))) - (if (= (ext:process-exit-code process) - 0) - ;; no error - (values) - (error "An error happend during ~A of ~A for ~A~%Please see /usr/share/doc/common-lisp-controller/REPORTING-BUGS.gz" - (ecase command - (:recompile "recompilation") - (:remove "removal")) - package - "cmucl")))) - -(in-package "COMMON-LISP-USER") - -(unless (ignore-errors - ;; it loaded, configure it for common-lisp-controller use: - (format t "~%Saving to new-lisp.core...") - (ext:gc :full t) - (setf ext:*batch-mode* nil) - (ext:save-lisp "new-lisp.core" - :purify t)) - (unix:unix-exit 1)) - diff --git a/dev-lisp/cmucl/files/19c/site-init.lisp.in b/dev-lisp/cmucl/files/19c/site-init.lisp.in deleted file mode 100644 index 94f999802061..000000000000 --- a/dev-lisp/cmucl/files/19c/site-init.lisp.in +++ /dev/null @@ -1,54 +0,0 @@ -;;; -*- Mode: Lisp; Package: System -*- -;;; -;;; ********************************************************************** -;;; This code was written as part of the CMU Common Lisp project at -;;; Carnegie Mellon University, and has been placed in the public domain. -;;; - -;;; Heavy modifications by Peter Van Eynde - -;;; More modifications for Gentoo by Matthew Kennedy -;;; <mkennedy@gentoo.org> - -(in-package "SYSTEM") - -(if (probe-file "/etc/lisp-config.lisp") - (load "/etc/lisp-config.lisp") - (format t "~%;;; Warning: There is no /etc/lisp-config.lisp 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 -;;; "Edit Definition" command and the debugger to find sources for functions in -;;; the core. -(setf (ext:search-list "target:") - '( - "/usr/share/common-lisp/source/cmucl/" ; object dir - )) - -(setf (ext:search-list "library:") '("/usr/lib/cmucl/")) -;;; for safety... - -;;; optional extentions to the lisp image: delete if you -;;; don't like them :-). -(in-package :common-lisp-user) - -;;; newbie functions, delete if you don't like them - -(defun help () - (format t "~ -Welcome to the Gentoo GNU/Linux port of CMUCL. - -The CMUCL REPL does not have GNU Readline-like support, however -you may wish to install rlwap (see: app-misc/rlwrap) to achieve -the same effect. - -If you think you found a bug, please use http://bugs.gentoo.org/ - -Read the documentation in /usr/share/doc/@PF@. - -(quit) exit Lisp -(describe 'foo) gives information about foo -(inspect '*foo*) interactively inspects *foo* -(apropos \"foo\") briefly describe all symbols which match \"foo\" -")) - diff --git a/dev-lisp/cmucl/files/19d-cmucl-patch-002.patch b/dev-lisp/cmucl/files/19d-cmucl-patch-002.patch deleted file mode 100644 index 4d7af2410990..000000000000 --- a/dev-lisp/cmucl/files/19d-cmucl-patch-002.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -ur src.orig/pcl/std-class.lisp src/pcl/std-class.lisp ---- src.orig/pcl/std-class.lisp 2005-07-07 11:44:27.000000000 -0500 -+++ src/pcl/std-class.lisp 2006-12-11 00:01:52.000000000 -0600 -@@ -816,13 +816,17 @@ - (when (and (not (or finalizep (class-finalized-p class))) - (not (class-has-a-forward-referenced-superclass-p class))) - (finalize-inheritance class) -+ (dolist (sub (class-direct-subclasses class)) -+ (update-class sub nil)) - (return-from update-class)) - ;; - (when (or finalizep - (class-finalized-p class) - (not (class-has-a-forward-referenced-superclass-p class))) - (setf (find-class (class-name class)) class) -- (update-cpl class (compute-class-precedence-list class)) -+ (let ((*allow-forward-referenced-classes-in-cpl-p* -+ (class-has-a-forward-referenced-superclass-p class))) -+ (update-cpl class (compute-class-precedence-list class))) - (update-slots class (compute-slots class)) - (update-gfs-of-class class) - (update-inits class (compute-default-initargs class)) -@@ -832,6 +836,9 @@ - (unless finalizep - (dolist (sub (class-direct-subclasses class)) - (update-class sub nil)))) -+) -+ -+(pushnew :cmucl-19d-patch-002 *features*) - - ;;; - ;;; Set values of shared slots from initforms inherited from diff --git a/dev-lisp/cmucl/files/19d-gentoo.patch b/dev-lisp/cmucl/files/19d-gentoo.patch deleted file mode 100644 index 3be6ee339420..000000000000 --- a/dev-lisp/cmucl/files/19d-gentoo.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ur cmucl.orig/src/lisp/Config.linux_gencgc cmucl/src/lisp/Config.linux_gencgc ---- cmucl.orig/src/lisp/Config.linux_gencgc 2006-07-18 21:54:31.000000000 -0500 -+++ cmucl/src/lisp/Config.linux_gencgc 2006-10-21 11:59:40.000000000 -0500 -@@ -21,7 +21,7 @@ - RUNTIME = $(GENCGC) $(LINKAGE) - # __NO_CTYPE so builds on glibc 2.3 will run on (some) older glibc's. - CPPFLAGS = -D__NO_CTYPE -I. -I$(PATH1) -I- -I/usr/X11R6/include $(RUNTIME) --CFLAGS = -rdynamic -Wstrict-prototypes -Wall -g $(RUNTIME) -+CFLAGS = @CFLAGS@ -rdynamic -Wstrict-prototypes -Wall -g $(RUNTIME) - ASFLAGS = -g -DGENCGC -DLINKAGE_TABLE - NM = $(PATH1)/linux-nm - UNDEFSYMPATTERN = -Xlinker -u -Xlinker & -diff -ur cmucl.orig/src/motif/server/Config.x86 cmucl/src/motif/server/Config.x86 ---- cmucl.orig/src/motif/server/Config.x86 2004-04-26 07:07:36.000000000 -0500 -+++ cmucl/src/motif/server/Config.x86 2006-10-21 11:59:13.000000000 -0500 -@@ -1,6 +1,6 @@ --CFLAGS = -O2 -I/usr/X11R6/include -I. -I$(VPATH) -+CFLAGS = @CFLAGS@ -I/usr/X11R6/include -I. -I$(VPATH) - LDFLAGS = -L/usr/X11R6/lib --LIBS = -static -lXm -dynamic -lXt -lXext -lX11 -lSM -lICE -lXp -ldl -lpthread -+LIBS = -lXm -lXt -lXext -lX11 -lSM -lICE -lXp -ldl -lpthread - # This def assumes you are building in the same or parallel - # tree to the CVS souce layout. Sites may need to customize - # this path. diff --git a/dev-lisp/cmucl/files/20a-multiplefixes.patch b/dev-lisp/cmucl/files/20a-multiplefixes.patch deleted file mode 100644 index ef2d66ff818e..000000000000 --- a/dev-lisp/cmucl/files/20a-multiplefixes.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/20a-patch000.patch b/dev-lisp/cmucl/files/20a-patch000.patch deleted file mode 100644 index e11c11ca37f8..000000000000 --- a/dev-lisp/cmucl/files/20a-patch000.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -ur cmucl.orig/src/code/print.lisp cmucl/src/code/print.lisp ---- cmucl.orig/src/code/print.lisp 2009-07-06 17:42:34.000000000 +0200 -+++ cmucl/src/code/print.lisp 2009-11-09 01:47:01.000000000 +0100 -@@ -2190,8 +2190,11 @@ - (set-bit #\_ extension-attribute) - (set-bit #\. dot-attribute) - (set-bit #\/ slash-attribute) -+ (set-bit #\` funny-attribute) -+ (set-bit #\| funny-attribute) - -- ;; Make anything not explicitly allowed funny... -+ ;; For everything else, derive the attribute from the Unicode -+ ;; properties of the character. - (dotimes (i char-code-limit) - (when (zerop (aref character-attributes i)) - (let* ((char (code-char i))) 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 41da86d014ff..000000000000 --- 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 034848d64a26..000000000000 --- 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 3aea006d159d..000000000000 --- 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 1fea01c327f3..000000000000 --- a/dev-lisp/cmucl/files/20b-patch001.patch +++ /dev/null @@ -1,110 +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 -@@ -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/20d-customize-lisp-implementation-version.patch b/dev-lisp/cmucl/files/20d-customize-lisp-implementation-version.patch deleted file mode 100644 index 8fc9278af87d..000000000000 --- a/dev-lisp/cmucl/files/20d-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/20d-execstack-fixes.patch b/dev-lisp/cmucl/files/20d-execstack-fixes.patch deleted file mode 100644 index 034848d64a26..000000000000 --- a/dev-lisp/cmucl/files/20d-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/fix-man-and-doc-installation.patch b/dev-lisp/cmucl/files/fix-man-and-doc-installation.patch deleted file mode 100644 index 0fe122255c90..000000000000 --- a/dev-lisp/cmucl/files/fix-man-and-doc-installation.patch +++ /dev/null @@ -1,42 +0,0 @@ -Index: tools/make-main-dist.sh -=================================================================== -RCS file: /project/cmucl/cvsroot/src/tools/make-main-dist.sh,v -retrieving revision 1.18 -diff -u -w -u -r1.18 make-main-dist.sh ---- cmucl/src/tools/make-main-dist.sh 13 Aug 2009 14:22:56 -0000 1.18 -+++ cmucl/src/tools/make-main-dist.sh 30 Sep 2009 14:26:41 -0000 -@@ -29,6 +29,7 @@ - fi - - DESTDIR=${INSTALL_DIR:-release-$$} -+DOCDIR=${DOCDIR:-doc/cmucl} - MANDIR=${MANDIR:-man/man1} - TARGET="`echo $1 | sed 's:/*$::'`" - VERSION=$2 -@@ -81,11 +82,11 @@ - # set -x - echo Installing main components - install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/bin --install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/doc/cmucl - install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/lib/cmucl - install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/lib/cmucl/lib - install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/lib/cmucl/lib/subsystems - install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/lib/cmucl/lib/ext-formats -+install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/${DOCDIR} - install -d ${GROUP} ${OWNER} -m 0755 $DESTDIR/${MANDIR} - install ${GROUP} ${OWNER} -m 0755 $TARGET/lisp/lisp $DESTDIR/bin/ - if [ "$EXECUTABLE" = "true" ] -@@ -126,11 +127,11 @@ - $DESTDIR/${MANDIR}/ - install ${GROUP} ${OWNER} -m 0644 src/general-info/lisp.1 \ - $DESTDIR/${MANDIR}/ --install ${GROUP} ${OWNER} -m 0644 src/general-info/README $DESTDIR/doc/cmucl/ -+install ${GROUP} ${OWNER} -m 0644 src/general-info/README $DESTDIR/${DOCDIR} - if [ -f src/general-info/release-$VERSION.txt ] - then - install ${GROUP} ${OWNER} -m 0644 src/general-info/release-$VERSION.txt \ -- $DESTDIR/doc/cmucl/ -+ $DESTDIR/${DOCDIR} - fi - - if [ -z "$INSTALL_DIR" ]; then |