diff options
Diffstat (limited to 'dev-lisp')
| -rw-r--r-- | dev-lisp/clisp/Manifest | 8 | ||||
| -rw-r--r-- | dev-lisp/clisp/clisp-2.31-r1.ebuild | 17 | ||||
| -rw-r--r-- | dev-lisp/clisp/clisp-2.32.ebuild | 123 | ||||
| -rw-r--r-- | dev-lisp/clisp/files/2.32/fastcgi-Makefile.in-gentoo.patch | 17 | ||||
| -rw-r--r-- | dev-lisp/clisp/files/2.32/format.lisp-gentoo.patch | 16 | ||||
| -rw-r--r-- | dev-lisp/clisp/files/digest-clisp-2.32 | 1 |
6 files changed, 175 insertions, 7 deletions
diff --git a/dev-lisp/clisp/Manifest b/dev-lisp/clisp/Manifest index 43014c05d1ad..6d8a80f8dd1f 100644 --- a/dev-lisp/clisp/Manifest +++ b/dev-lisp/clisp/Manifest @@ -1,12 +1,12 @@ -MD5 2b8a31739d126ad4560310cc5186b336 ChangeLog 3597 +MD5 2ed40785ed4f60baa22658dc42df3c23 ChangeLog 3812 MD5 49613e495da0b6f83016281175cb56c3 clisp-2.28.ebuild 1380 MD5 44ca75fcfa29c894ce368e2a05834a04 clisp-2.29.ebuild 1435 MD5 41aa178dc9617efc0c8f8d72d658dd81 clisp-2.30-r1.ebuild 2197 MD5 a881823bfbd7a3504b176a965ee2b266 clisp-2.30.ebuild 1460 -MD5 1001391f10a86a142b21fbc42662fe5d clisp-2.32.ebuild 3820 +MD5 00284072d47a76860fe005a97f8d2ece clisp-2.32.ebuild 3781 MD5 485cde76397408cf913fc6d4c7a45a67 metadata.xml 882 MD5 696a13636ace75f2840e73a4bd8c5433 clisp-2.31.ebuild 2907 -MD5 1001391f10a86a142b21fbc42662fe5d clisp-2.31-r1.ebuild 3820 +MD5 71f82f22579ae31fffda2943f3428c5f clisp-2.31-r1.ebuild 3820 MD5 c112ebf612bf8e262c4285fd4c7e9553 files/clisp-2.30-gentoo.patch 1301 MD5 ec015c64b7aca6f6721123c27d7d921c files/clisp-2.30-linux.lisp-upstream.patch 4712 MD5 fe93240f140623bf55d2e503f6d8e01e files/clisp.sh 2792 @@ -21,3 +21,5 @@ MD5 da9eb2a136566bdce0620c950df941b2 files/digest-clisp-2.32 64 MD5 9b76ca10cf785d54c75803e8fddc91cb files/2.31/bindings-glibc-linux.lisp-gentoo.patch 1292 MD5 9db8f3ac2974a7d9725148ecc0709cc8 files/2.31/bindings-wildcard-fnmatch.c-gentoo.patch 1248 MD5 ff3506766c1fc9216e04f650f39c0e94 files/2.31/fastcgi-Makefile.in-gentoo.patch 654 +MD5 83877a7508037b3286d37fc12f09650c files/2.32/fastcgi-Makefile.in-gentoo.patch 663 +MD5 ed4100707b93b34a7825b915690e9ccd files/2.32/format.lisp-gentoo.patch 651 diff --git a/dev-lisp/clisp/clisp-2.31-r1.ebuild b/dev-lisp/clisp/clisp-2.31-r1.ebuild index 3e6371c8c0ec..c14553444eb1 100644 --- a/dev-lisp/clisp/clisp-2.31-r1.ebuild +++ b/dev-lisp/clisp/clisp-2.31-r1.ebuild @@ -1,11 +1,21 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. +# Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/clisp-2.31-r1.ebuild,v 1.1 2003/11/29 07:25:39 mkennedy Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/clisp-2.31-r1.ebuild,v 1.2 2004/01/11 09:50:39 mkennedy Exp $ inherit flag-o-matic IUSE="X threads fastcgi postgres ldap nls" +# Handle the case where the user has some other -falign-functions +# option set. Bug 34630. + +if ! is-flag '-falign-functions=4' \ + && expr "$CFLAGS" : '.*\(-falign-functions=[[:digit:]]\+\)' >/dev/null; then + CFLAGS=${CFLAGS/\ +$(expr "$CFLAGS" : '.*\(-falign-functions=[[:digit:]]\+\)')/\ +-falign-functions=4} +fi + # Fails to compile without -falign-functions=4 when -march=pentium4 # (or -march=pentium3, sometimes??) is defined. Bugs 33425 and 34630. @@ -20,10 +30,8 @@ fi if is-flag '-march=athlon-xp'; then filter-flags '-O*' -# replace-flags '-O3' '-O2' fi - DESCRIPTION="A portable, bytecode-compiled implementation of Common Lisp" HOMEPAGE="http://clisp.sourceforge.net/" SRC_URI="mirror://sourceforge/clisp/${P}.tar.bz2" @@ -49,6 +57,7 @@ src_unpack() { } src_compile() { + einfo "Using CFLAGS: ${CFLAGS}" export CC="${CC} ${CFLAGS}" unset CFLAGS CXXFLAGS local myconf="--with-dynamic-ffi diff --git a/dev-lisp/clisp/clisp-2.32.ebuild b/dev-lisp/clisp/clisp-2.32.ebuild new file mode 100644 index 000000000000..c03bfbf6ef30 --- /dev/null +++ b/dev-lisp/clisp/clisp-2.32.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2004 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lisp/clisp/clisp-2.32.ebuild,v 1.1 2004/01/11 09:50:39 mkennedy Exp $ + +inherit flag-o-matic + +IUSE="X threads fastcgi postgres ldap nls berkdb" + +# Handle the case where the user has some other -falign-functions +# option set. Bug 34630. + +if ! is-flag '-falign-functions=4' \ + && expr "$CFLAGS" : '.*\(-falign-functions=[[:digit:]]\+\)' >/dev/null; then + CFLAGS=${CFLAGS/\ +$(expr "$CFLAGS" : '.*\(-falign-functions=[[:digit:]]\+\)')/\ +-falign-functions=4} +fi + +# Fails to compile without -falign-functions=4 when -march=pentium4 +# (or -march=pentium3, sometimes??) is defined. Bugs 33425 and 34630. + +if (is-flag '-march=pentium4' || is-flag '-march=pentium3') \ + && ! is-flag '-falign-functions=4'; then + append-flags '-falign-functions=4' +fi + +# Athlon XP users report problems with -O3 optimization. In this +# block, we remove any optimization flag. Depending on bug 34497. we +# may be able to reduce optimization to -O2. + +if is-flag '-march=athlon-xp'; then + filter-flags '-O*' +fi + +DESCRIPTION="A portable, bytecode-compiled implementation of Common Lisp" +HOMEPAGE="http://clisp.sourceforge.net/" +SRC_URI="mirror://sourceforge/clisp/${P}.tar.bz2" +S=${WORKDIR}/${P} +DEPEND="dev-libs/libsigsegv + dev-lisp/common-lisp-controller + fastcgi? ( dev-libs/fcgi ) + postgres? ( dev-db/postgresql ) + X? ( x11-base/xfree ) + ldap? ( net-nds/openldap ) + readline? ( sys-libs/readline ) + nls? ( sys-devel/gettext ) + berkdb? ( =sys-libs/db-4* )" +LICENSE="GPL-2" +SLOT="2" +KEYWORDS="~x86" + +src_unpack() { + unpack ${A} + epatch ${FILESDIR}/${PV}/fastcgi-Makefile.in-gentoo.patch + epatch ${FILESDIR}/${PV}/format.lisp-gentoo.patch +} + +src_compile() { + einfo "Using CFLAGS: ${CFLAGS}" + export CC="${CC} ${CFLAGS}" + unset CFLAGS CXXFLAGS + local myconf="--with-dynamic-ffi + --with-unicode + --with-module=regexp + --with-module=syscalls + --with-module=wildcard + --with-module=bindings/glibc" + use readline || myconf="${myconf} --with-noreadline" + use nls || myconf="${myconf} --with-nogettext" + use X && myconf="${myconf} --with-module=clx/new-clx" + use postgres && myconf="${myconf} --with-module=postgresql" + use fastcgi && myconf="${myconf} --with-module=fastcgi" +# use berkdb && myconf="${myconf} --with-module=berkeley-db" # needs work +# use ldap && myconf="${myconf} --with-module=dirkey" # openldap is broken +# use threads && myconf="${myconf} --with-threads=POSIX_THREADS" # broken + ./configure --prefix=/usr ${myconf} build || die "./configure failed" + cd build + ./makemake ${myconf} >Makefile + make config.lisp + sed -i 's,"vi","nano",g' config.lisp + make || die +} + +src_install() { + cd build && make DESTDIR=${D} prefix=/usr install-bin || die + + doman clisp.1 + dodoc SUMMARY README* NEWS MAGIC.add GNU-GPL COPYRIGHT \ + ANNOUNCE clisp.dvi clisp.html + + rm -f ${D}/usr/lib/clisp/base/* + (cd ${D}/usr/lib/clisp/base && ln -s ../full/* .) + chmod a+x ${D}/usr/lib/clisp/clisp-link + + # install common-lisp-controller profile + exeinto /usr/lib/common-lisp/bin + doexe ${FILESDIR}/clisp.sh + insinto /usr/lib/clisp + doins ${FILESDIR}/install-clc.lisp + + keepdir /usr/lib/common-lisp/clisp +} + +pkg_preinst() { + local clisp_dir=/usr/lib/clisp + local old_mem=$clisp_dir/full/lispinit.mem + local new_mem=$clisp_dir/full/lispinit-new.mem + local clean_mem=$clisp_dir/full/lispinit-clean.mem + local lisp_run=$clisp_dir/full/lisp.run + + rm -f $old_mem $new_mem $clean_mem $lisp_run +} + +pkg_postinst() { + chown cl-builder:cl-builder /usr/lib/common-lisp/clisp + rm -rf /usr/lib/common-lisp/clisp/* || true + /usr/bin/clc-autobuild-impl clisp yes + /usr/sbin/register-common-lisp-implementation clisp +} + +pkg_prerm() { + rm -rf /usr/lib/common-lisp/clisp/* || true +} diff --git a/dev-lisp/clisp/files/2.32/fastcgi-Makefile.in-gentoo.patch b/dev-lisp/clisp/files/2.32/fastcgi-Makefile.in-gentoo.patch new file mode 100644 index 000000000000..9a7011f59e03 --- /dev/null +++ b/dev-lisp/clisp/files/2.32/fastcgi-Makefile.in-gentoo.patch @@ -0,0 +1,17 @@ +diff -ur clisp-2.32.original/modules/fastcgi/Makefile.in clisp-2.32/modules/fastcgi/Makefile.in +--- clisp-2.32.original/modules/fastcgi/Makefile.in 2003-01-09 14:16:46.000000000 -0600 ++++ clisp-2.32/modules/fastcgi/Makefile.in 2004-01-11 03:20:32.000000000 -0600 +@@ -21,10 +21,10 @@ + $(CLISP) -c fastcgi.lisp + + fastcgi.o: fastcgi.c +- $(CC) $(CFLAGS) $(INCLUDES) -I.. -c fastcgi.c ++ $(CC) $(CFLAGS) -I.. -c fastcgi.c + + fastcgi_wrappers.o: fastcgi_wrappers.c +- $(CC) $(CFLAGS) $(INCLUDES) -I.. -c fastcgi_wrappers.c ++ $(CC) $(CFLAGS) -I.. -c fastcgi_wrappers.c + + # Make a module + clisp-module : all +Only in clisp-2.32/modules/fastcgi/: Makefile.in~ diff --git a/dev-lisp/clisp/files/2.32/format.lisp-gentoo.patch b/dev-lisp/clisp/files/2.32/format.lisp-gentoo.patch new file mode 100644 index 000000000000..870f9ba4f8e1 --- /dev/null +++ b/dev-lisp/clisp/files/2.32/format.lisp-gentoo.patch @@ -0,0 +1,16 @@ +--- clisp-2.32.orig/src/format.lisp ++++ clisp-2.32/src/format.lisp +@@ -2430,9 +2430,10 @@ + (prefix suffix per-line-p body-csdl add-fill + last-csdl) + (format-logical-block-parse *FORMAT-CSDL*) +- (when add-fill +- (format-error *FORMAT-CS* (csd-cs-index (car *FORMAT-CSDL*)) +- (TEXT "Error: ~~:@> not implemented"))) ++;;; Disabled to allow CLC to work (WN) ++; (when add-fill ++; (format-error *FORMAT-CS* (csd-cs-index (car *FORMAT-CSDL*)) ++; (TEXT "Error: ~~:@> not implemented"))) + (setq *FORMAT-CSDL* body-csdl) + (labels ((compute-inner () + `((PPRINT-LOGICAL-BLOCK diff --git a/dev-lisp/clisp/files/digest-clisp-2.32 b/dev-lisp/clisp/files/digest-clisp-2.32 new file mode 100644 index 000000000000..969a97673b14 --- /dev/null +++ b/dev-lisp/clisp/files/digest-clisp-2.32 @@ -0,0 +1 @@ +MD5 20a036128ec04e7a48d44c1a1c6f8afe clisp-2.32.tar.bz2 5982226 |