From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 803BA59CAF for ; Sun, 3 Apr 2016 15:48:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AE5D321C029; Sun, 3 Apr 2016 15:48:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 3D55321C029 for ; Sun, 3 Apr 2016 15:48: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-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B1E53340CC3 for ; Sun, 3 Apr 2016 15:48:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3444882 for ; Sun, 3 Apr 2016 15:48:15 +0000 (UTC) From: "Andrey Grozin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrey Grozin" Message-ID: <1459697905.2bbd01cf251c6ab7d32952dfadf93c5e4737678e.grozin@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lisp/cmucl/files/, dev-lisp/cmucl/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lisp/cmucl/Manifest dev-lisp/cmucl/cmucl-21a.ebuild dev-lisp/cmucl/files/21a-build.patch dev-lisp/cmucl/files/21a-customize-lisp-implementation-version.patch dev-lisp/cmucl/files/21a-execstack-fixes.patch X-VCS-Directories: dev-lisp/cmucl/files/ dev-lisp/cmucl/ X-VCS-Committer: grozin X-VCS-Committer-Name: Andrey Grozin X-VCS-Revision: 2bbd01cf251c6ab7d32952dfadf93c5e4737678e X-VCS-Branch: master Date: Sun, 3 Apr 2016 15:48:15 +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: a804713e-41bf-4685-b03d-3e10c2f80809 X-Archives-Hash: 78442c3f36333010a3cc3b0ccb2cdf51 commit: 2bbd01cf251c6ab7d32952dfadf93c5e4737678e Author: Andrey Grozin gentoo org> AuthorDate: Sun Apr 3 15:37:17 2016 +0000 Commit: Andrey Grozin gentoo org> CommitDate: Sun Apr 3 15:38:25 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bbd01cf dev-lisp/cmucl: bump tp 21a Package-Manager: portage-2.2.28 dev-lisp/cmucl/Manifest | 2 + dev-lisp/cmucl/cmucl-21a.ebuild | 93 ++++++++++++++++ dev-lisp/cmucl/files/21a-build.patch | 22 ++++ ...21a-customize-lisp-implementation-version.patch | 16 +++ dev-lisp/cmucl/files/21a-execstack-fixes.patch | 118 +++++++++++++++++++++ 5 files changed, 251 insertions(+) diff --git a/dev-lisp/cmucl/Manifest b/dev-lisp/cmucl/Manifest index 35610f6..296d1a4 100644 --- a/dev-lisp/cmucl/Manifest +++ b/dev-lisp/cmucl/Manifest @@ -1,2 +1,4 @@ DIST cmucl-20e-x86-linux.tar.bz2 18861880 SHA256 94dc1c0ddcaa915f83cdc23462a4cc3c4af98d64fe42e79d7c5232225b149480 SHA512 1eee852b2a11733d0fac2c046137ccd099370bf208be71becc03710e832510b288768f557e326b1ce95cba16490413142e607fd71346e20e5f8592b51d86b0fe WHIRLPOOL 765476aeb037b782380b33fb8e7ae137bb38544547b427c54c23661122552108e8940413c55003c31ba05b4729bb18f99f5b462742cbd9c1c7426f0c04e26863 +DIST cmucl-21a-x86-linux.tar.bz2 10870693 SHA256 02d00c025723e7a2fa7a44e43d3f27ec39c9b871ea0332e472a439ada2620d71 SHA512 7f7d327e47b01dcee1cbb05aae826ef7c64d4d192d7d32d1aba51c8839a06d65942fff5d4c7dbccc955e1e233d2065d83d078266327caee07201e9dce59c39ee WHIRLPOOL 50e64b6d03464c9fc7015d3d6829949ab4bc41f69b890a82f36096f89d63da989197deaa7164c687d781b70ca2a7b23e3e23f9605bdb986f5a94553e9aa664c0 DIST cmucl-src-20e.tar.bz2 6147575 SHA256 b18fd27b67321a0c00f2019bbb18557f239062ba947080149ed42e30f72ae7cd SHA512 d04f6ac7335572198d37d5df00934edfc82495294446cc5420dada4f2df44009f0983b438d6f10ce5bb02e46fd89df985da5eee3e91a6a75d98e9f86240c0dcc WHIRLPOOL babb020bacf474e1cea4bc865ba7352686ff5d92d01dd4d44d121b101ac328da6cd3e63798a2086ce29ba260fdbefc26f5f7d496ecb0af9566cb1cbdbb3846bf +DIST cmucl-src-21a.tar.bz2 8195492 SHA256 41604a4f828a134dbf8a58623f45bd81b76ae05fc5c4cea5ccb74edfdc9e3167 SHA512 74b077732030dbc3681aadcf9c802fd5b399362c9653b972063e49eb0a2ad528d02d6dde74107210c94c94dc7e9664472c2d072a6ae6f75e7e8c4cf847987e3b WHIRLPOOL 8799e9a2171ef1a9eebce4deaed8aaaa3e2b5e0970ca158020792cc5d864f71525c175b2e9530f8faeee8d1c49a14b04803ed1aa83dc1247c2005a80f5fc972e diff --git a/dev-lisp/cmucl/cmucl-21a.ebuild b/dev-lisp/cmucl/cmucl-21a.ebuild new file mode 100644 index 0000000..257f739 --- /dev/null +++ b/dev-lisp/cmucl/cmucl-21a.ebuild @@ -0,0 +1,93 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +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 new file mode 100644 index 0000000..4642341 --- /dev/null +++ b/dev-lisp/cmucl/files/21a-build.patch @@ -0,0 +1,22 @@ +diff -r -U2 21a.orig/bin/build.sh 21a/bin/build.sh +--- 21a.orig/bin/build.sh 2015-05-19 07:42:40.000000000 +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/cmucl/files/21a-customize-lisp-implementation-version.patch b/dev-lisp/cmucl/files/21a-customize-lisp-implementation-version.patch new file mode 100644 index 0000000..8fc9278 --- /dev/null +++ b/dev-lisp/cmucl/files/21a-customize-lisp-implementation-version.patch @@ -0,0 +1,16 @@ +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/21a-execstack-fixes.patch b/dev-lisp/cmucl/files/21a-execstack-fixes.patch new file mode 100644 index 0000000..034848d --- /dev/null +++ b/dev-lisp/cmucl/files/21a-execstack-fixes.patch @@ -0,0 +1,118 @@ +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 + #include + #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 ++ + #include + #include + #include +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