From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 98F531396D9 for ; Tue, 24 Oct 2017 18:47:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CA979E0D39; Tue, 24 Oct 2017 18:47:19 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 96892E0D39 for ; Tue, 24 Oct 2017 18:47:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6818F33C4EE for ; Tue, 24 Oct 2017 18:47:18 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F2F1431F for ; Tue, 24 Oct 2017 18:47:16 +0000 (UTC) From: "Andreas Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" Message-ID: <1508870824.903dbc323ec045290c9a9a5809bde6ce8e2f8938.dilfridge@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lisp/clisp/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lisp/clisp/clisp-2.49-r101.ebuild dev-lisp/clisp/clisp-2.49-r9.ebuild X-VCS-Directories: dev-lisp/clisp/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: 903dbc323ec045290c9a9a5809bde6ce8e2f8938 X-VCS-Branch: master Date: Tue, 24 Oct 2017 18:47:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: b3c9ac43-9788-4680-8237-451c3e4dafdc X-Archives-Hash: 3da414f1d58374439174eee71ee68b7d commit: 903dbc323ec045290c9a9a5809bde6ce8e2f8938 Author: Andreas K. Hüttel gentoo org> AuthorDate: Tue Oct 24 18:46:31 2017 +0000 Commit: Andreas Hüttel gentoo org> CommitDate: Tue Oct 24 18:47:04 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=903dbc32 dev-lisp/clisp: Add revision bumps forcing -no-pie, bug 594552 Both stable (straight to stable) subslot (for stable readline) and ~arch subslot (for ~arch readline) are handled. Closes: https://bugs.gentoo.org/618170 Package-Manager: Portage-2.3.12, Repoman-2.3.3 dev-lisp/clisp/clisp-2.49-r101.ebuild | 153 ++++++++++++++++++++++++++++++++++ dev-lisp/clisp/clisp-2.49-r9.ebuild | 147 ++++++++++++++++++++++++++++++++ 2 files changed, 300 insertions(+) diff --git a/dev-lisp/clisp/clisp-2.49-r101.ebuild b/dev-lisp/clisp/clisp-2.49-r101.ebuild new file mode 100644 index 00000000000..7cf1812267c --- /dev/null +++ b/dev-lisp/clisp/clisp-2.49-r101.ebuild @@ -0,0 +1,153 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +inherit eutils flag-o-matic multilib toolchain-funcs + +DESCRIPTION="A portable, bytecode-compiled implementation of Common Lisp" +HOMEPAGE="http://clisp.sourceforge.net/" +SRC_URI="mirror://sourceforge/clisp/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="2/7" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="hyperspec X berkdb dbus fastcgi gdbm gtk pari +pcre postgres +readline svm -threads +unicode +zlib" +# "jit" disabled ATM + +RDEPEND=">=dev-lisp/asdf-2.33-r3 + virtual/libiconv + >=dev-libs/libsigsegv-2.4 + >=dev-libs/ffcall-1.10 + dbus? ( sys-apps/dbus ) + fastcgi? ( dev-libs/fcgi ) + gdbm? ( sys-libs/gdbm ) + gtk? ( >=x11-libs/gtk+-2.10:2 >=gnome-base/libglade-2.6 ) + pari? ( =dev-db/postgresql-8.0:* ) + readline? ( >=sys-libs/readline-7.0:0= ) + pcre? ( dev-libs/libpcre:3 ) + svm? ( sci-libs/libsvm ) + zlib? ( sys-libs/zlib ) + X? ( x11-libs/libXpm ) + hyperspec? ( dev-lisp/hyperspec ) + berkdb? ( sys-libs/db:4.8 )" +# jit? ( >=dev-libs/lightning-1.2 ) + +DEPEND="${RDEPEND} + X? ( x11-misc/imake x11-proto/xextproto )" + +enable_modules() { + [[ $# = 0 ]] && die "${FUNCNAME[0]} must receive at least one argument" + for m in "$@" ; do + einfo "enabling module $m" + myconf+=" --with-module=${m}" + done +} + +BUILDDIR="builddir" + +# modules not enabled: +# * berkdb: must figure out a way to make the configure script pick up the +# currect version of the library and headers +# * dirkey: fails to compile, requiring windows.h, possibly wrong #ifdefs +# * matlab, netica: not in portage +# * oracle: can't install oracle-instantclient + +src_prepare() { + # More than -O1 breaks alpha/ia64 + if use alpha || use ia64; then + sed -i -e 's/-O2//g' src/makemake.in || die + fi + epatch "${FILESDIR}"/${P}-bits_ipctypes_to_sys_ipc.patch + epatch "${FILESDIR}"/${P}-get_hostname.patch + epatch "${FILESDIR}"/${P}-tinfo.patch + # bug #594552 + epatch "${FILESDIR}"/${P}-readline-7.patch +} + +src_configure() { + # Bug 618170. If anyone has a better idea... + append-flags -no-pie + + # We need this to build on alpha/ia64 + if use alpha || use ia64; then + replace-flags -O? -O1 + append-flags '-D NO_MULTIMAP_SHM -D NO_MULTIMAP_FILE -D NO_SINGLEMAP -D NO_TRIVIALMAP' + fi + + if use x86; then + append-flags -falign-functions=4 + fi + + # QA issue with lisp.run + append-flags -Wa,--noexecstack + + # built-in features + local myconf="--with-ffcall --without-dynamic-modules" +# There's a problem with jit_allocai function +# if use jit; then +# myconf+=" --with-jitc=lightning" +# fi + if use threads; then + myconf+=" --with-threads=POSIX_THREADS" + fi + + # default modules + enable_modules wildcard rawsock + # optional modules + use elibc_glibc && enable_modules bindings/glibc + use X && enable_modules clx/new-clx + if use postgres; then + enable_modules postgresql + append-cppflags -I$(pg_config --includedir) + fi + if use berkdb; then + enable_modules berkeley-db + append-cppflags -I/usr/include/db4.8 + fi + use dbus && enable_modules dbus + use fastcgi && enable_modules fastcgi + use gdbm && enable_modules gdbm + use gtk && enable_modules gtk2 + use pari && enable_modules pari + use pcre && enable_modules pcre + use svm && enable_modules libsvm + use zlib && enable_modules zlib + + if use hyperspec; then + CLHSROOT="file:///usr/share/doc/hyperspec/HyperSpec/" + else + CLHSROOT="http://www.lispworks.com/reference/HyperSpec/" + fi + + # configure chokes on --sysconfdir option + local configure="./configure --prefix=/usr --libdir=/usr/$(get_libdir) \ + $(use_with readline) $(use_with unicode) \ + ${myconf} --hyperspec=${CLHSROOT} ${BUILDDIR}" + einfo "${configure}" + ${configure} || die "./configure failed" + + IMPNOTES="file://${ROOT%/}/usr/share/doc/${PN}-${PVR}/html/impnotes.html" + sed -i "s,http://clisp.cons.org/impnotes/,${IMPNOTES},g" \ + "${BUILDDIR}"/config.lisp || die "Cannot fix link to implementation notes" +} + +src_compile() { + export VARTEXFONTS="${T}"/fonts + cd "${BUILDDIR}" + # parallel build fails + emake -j1 +} + +src_install() { + pushd "${BUILDDIR}" + make DESTDIR="${D}" prefix=/usr install-bin || die "Installation failed" + doman clisp.1 + dodoc ../SUMMARY README* ../src/NEWS ../unix/MAGIC.add ../ANNOUNCE + # stripping them removes common symbols (defined but uninitialised variables) + # which are then needed to build modules... + export STRIP_MASK="*/usr/$(get_libdir)/clisp-${PV}/*/*" + popd + dohtml doc/impnotes.{css,html} doc/regexp.html doc/clisp.png + dodoc doc/{CLOS-guide,LISP-tutorial}.txt +} diff --git a/dev-lisp/clisp/clisp-2.49-r9.ebuild b/dev-lisp/clisp/clisp-2.49-r9.ebuild new file mode 100644 index 00000000000..017287c7dd4 --- /dev/null +++ b/dev-lisp/clisp/clisp-2.49-r9.ebuild @@ -0,0 +1,147 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 +inherit eutils flag-o-matic multilib toolchain-funcs + +DESCRIPTION="A portable, bytecode-compiled implementation of Common Lisp" +HOMEPAGE="http://clisp.sourceforge.net/" +SRC_URI="mirror://sourceforge/clisp/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="2/${PV}" +KEYWORDS="amd64 ~ppc ~sparc x86" +IUSE="hyperspec X berkdb dbus fastcgi gdbm gtk pari +pcre postgres +readline svm -threads +unicode +zlib" +# "jit" disabled ATM + +RDEPEND=">=dev-lisp/asdf-2.33-r3 + virtual/libiconv + >=dev-libs/libsigsegv-2.4 + >=dev-libs/ffcall-1.10 + dbus? ( sys-apps/dbus ) + fastcgi? ( dev-libs/fcgi ) + gdbm? ( sys-libs/gdbm ) + gtk? ( >=x11-libs/gtk+-2.10 >=gnome-base/libglade-2.6 ) + pari? ( =dev-db/postgresql-8.0 ) + readline? ( >=sys-libs/readline-5.0 =dev-libs/lightning-1.2 ) + +DEPEND="${RDEPEND} + X? ( x11-misc/imake x11-proto/xextproto )" + +enable_modules() { + [[ $# = 0 ]] && die "${FUNCNAME[0]} must receive at least one argument" + for m in "$@" ; do + einfo "enabling module $m" + myconf+=" --with-module=${m}" + done +} + +BUILDDIR="builddir" + +# modules not enabled: +# * berkdb: must figure out a way to make the configure script pick up the +# currect version of the library and headers +# * dirkey: fails to compile, requiring windows.h, possibly wrong #ifdefs +# * matlab, netica: not in portage +# * oracle: can't install oracle-instantclient + +src_prepare() { + # More than -O1 breaks alpha/ia64 + if use alpha || use ia64; then + sed -i -e 's/-O2//g' src/makemake.in || die + fi + epatch "${FILESDIR}"/${P}-bits_ipctypes_to_sys_ipc.patch + epatch "${FILESDIR}"/${P}-get_hostname.patch + epatch "${FILESDIR}"/${P}-tinfo.patch +} + +src_configure() { + # Bug 618170. If anyone has a better idea... + append-flags -no-pie + + # We need this to build on alpha/ia64 + if use alpha || use ia64; then + replace-flags -O? -O1 + append-flags '-D NO_MULTIMAP_SHM -D NO_MULTIMAP_FILE -D NO_SINGLEMAP -D NO_TRIVIALMAP' + fi + + # QA issue with lisp.run + append-flags -Wa,--noexecstack + + # built-in features + local myconf="--with-ffcall --without-dynamic-modules" +# There's a problem with jit_allocai function +# if use jit; then +# myconf+=" --with-jitc=lightning" +# fi + if use threads; then + myconf+=" --with-threads=POSIX_THREADS" + fi + + # default modules + enable_modules wildcard rawsock + # optional modules + use elibc_glibc && enable_modules bindings/glibc + use X && enable_modules clx/new-clx + if use postgres; then + enable_modules postgresql + append-cppflags -I$(pg_config --includedir) + fi + if use berkdb; then + enable_modules berkeley-db + append-cppflags -I/usr/include/db4.8 + fi + use dbus && enable_modules dbus + use fastcgi && enable_modules fastcgi + use gdbm && enable_modules gdbm + use gtk && enable_modules gtk2 + use pari && enable_modules pari + use pcre && enable_modules pcre + use svm && enable_modules libsvm + use zlib && enable_modules zlib + + if use hyperspec; then + CLHSROOT="file:///usr/share/doc/hyperspec/HyperSpec/" + else + CLHSROOT="http://www.lispworks.com/reference/HyperSpec/" + fi + + # configure chokes on --sysconfdir option + local configure="./configure --prefix=/usr --libdir=/usr/$(get_libdir) \ + $(use_with readline) $(use_with unicode) \ + ${myconf} --hyperspec=${CLHSROOT} ${BUILDDIR}" + einfo "${configure}" + ${configure} || die "./configure failed" + + IMPNOTES="file://${ROOT%/}/usr/share/doc/${PN}-${PVR}/html/impnotes.html" + sed -i "s,http://clisp.cons.org/impnotes/,${IMPNOTES},g" \ + "${BUILDDIR}"/config.lisp || die "Cannot fix link to implementation notes" +} + +src_compile() { + export VARTEXFONTS="${T}"/fonts + cd "${BUILDDIR}" + # parallel build fails + emake -j1 +} + +src_install() { + pushd "${BUILDDIR}" + make DESTDIR="${D}" prefix=/usr install-bin || die "Installation failed" + doman clisp.1 + dodoc ../SUMMARY README* ../src/NEWS ../unix/MAGIC.add ../ANNOUNCE + # stripping them removes common symbols (defined but uninitialised variables) + # which are then needed to build modules... + export STRIP_MASK="*/usr/$(get_libdir)/clisp-${PV}/*/*" + popd + dohtml doc/impnotes.{css,html} doc/regexp.html doc/clisp.png + dodoc doc/{CLOS-guide,LISP-tutorial}.txt +}