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 37EEB1382C5 for ; Wed, 2 May 2018 21:19:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 45116E086D; Wed, 2 May 2018 21:19:53 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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 0C285E086D for ; Wed, 2 May 2018 21:19:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 22AE1335C5A for ; Wed, 2 May 2018 21:19:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B931B28 for ; Wed, 2 May 2018 21:19:48 +0000 (UTC) From: "José María Alonso" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "José María Alonso" Message-ID: <1525295986.3d1ccab4bd419cb1c718834ce307ed707068a464.nimiux@gentoo> Subject: [gentoo-commits] proj/lisp:master commit in: dev-lisp/cmucl/files/, dev-lisp/cmucl/ X-VCS-Repository: proj/lisp X-VCS-Files: dev-lisp/cmucl/cmucl-20e.ebuild dev-lisp/cmucl/files/20e-customize-lisp-implementation-version.patch dev-lisp/cmucl/files/20e-execstack-fixes.patch X-VCS-Directories: dev-lisp/cmucl/files/ dev-lisp/cmucl/ X-VCS-Committer: nimiux X-VCS-Committer-Name: José María Alonso X-VCS-Revision: 3d1ccab4bd419cb1c718834ce307ed707068a464 X-VCS-Branch: master Date: Wed, 2 May 2018 21:19:48 +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: 8d6f01f8-64b0-42fb-9f2f-8359bcb973c1 X-Archives-Hash: 2396e093b06d175441537f253e889f12 commit: 3d1ccab4bd419cb1c718834ce307ed707068a464 Author: Chema Alonso Josa gentoo org> AuthorDate: Wed May 2 21:19:46 2018 +0000 Commit: José María Alonso gentoo org> CommitDate: Wed May 2 21:19:46 2018 +0000 URL: https://gitweb.gentoo.org/proj/lisp.git/commit/?id=3d1ccab4 dev-lisp/cmucl: Drops old version 20e dev-lisp/cmucl/cmucl-20e.ebuild | 97 ----------------- ...20e-customize-lisp-implementation-version.patch | 16 --- dev-lisp/cmucl/files/20e-execstack-fixes.patch | 118 --------------------- 3 files changed, 231 deletions(-) diff --git a/dev-lisp/cmucl/cmucl-20e.ebuild b/dev-lisp/cmucl/cmucl-20e.ebuild deleted file mode 100644 index 9e122b9a..00000000 --- a/dev-lisp/cmucl/cmucl-20e.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2015 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 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 > /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/20e-customize-lisp-implementation-version.patch b/dev-lisp/cmucl/files/20e-customize-lisp-implementation-version.patch deleted file mode 100644 index 8fc9278a..00000000 --- a/dev-lisp/cmucl/files/20e-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/20e-execstack-fixes.patch b/dev-lisp/cmucl/files/20e-execstack-fixes.patch deleted file mode 100644 index 034848d6..00000000 --- a/dev-lisp/cmucl/files/20e-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 - #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