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 0C3BE59CA5 for ; Sat, 19 Mar 2016 23:45:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CA4DEE085B; Sat, 19 Mar 2016 23:45:07 +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 09B08E085B for ; Sat, 19 Mar 2016 23:45:06 +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 4552A33FD24 for ; Sat, 19 Mar 2016 23:45:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C8396861 for ; Sat, 19 Mar 2016 23:45:02 +0000 (UTC) From: "Ian Delaney" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ian Delaney" Message-ID: <1458431064.93ae4c5c3c7f88413fcc79fe77abcaf9c12337d3.idella4@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lisp/sbcl/files/, dev-lisp/sbcl/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lisp/sbcl/files/sbcl-1.1.18-graphiz-2.38.patch dev-lisp/sbcl/sbcl-1.1.18-r1.ebuild X-VCS-Directories: dev-lisp/sbcl/ dev-lisp/sbcl/files/ X-VCS-Committer: idella4 X-VCS-Committer-Name: Ian Delaney X-VCS-Revision: 93ae4c5c3c7f88413fcc79fe77abcaf9c12337d3 X-VCS-Branch: master Date: Sat, 19 Mar 2016 23:45:02 +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: ce7e3958-9947-4111-af4b-eaa3e8115abb X-Archives-Hash: 6df8103e277c4a8cababb404eb1c9fb5 commit: 93ae4c5c3c7f88413fcc79fe77abcaf9c12337d3 Author: Nicholas Vinson gmail com> AuthorDate: Sat Mar 19 01:47:39 2016 +0000 Commit: Ian Delaney gentoo org> CommitDate: Sat Mar 19 23:44:24 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93ae4c5c =dev-lisp/sbcl-1.1.18: Add graphviz-2.38.0 patch Patch sbcl-1.1.18[doc] to build against graphiz-2.38.0. Gentoo-Bug: #577514 Package-Manager: portage-2.2.28 Closes: https://github.com/gentoo/gentoo/pull/1085 dev-lisp/sbcl/files/sbcl-1.1.18-graphiz-2.38.patch | 19 ++ dev-lisp/sbcl/sbcl-1.1.18-r1.ebuild | 218 +++++++++++++++++++++ 2 files changed, 237 insertions(+) diff --git a/dev-lisp/sbcl/files/sbcl-1.1.18-graphiz-2.38.patch b/dev-lisp/sbcl/files/sbcl-1.1.18-graphiz-2.38.patch new file mode 100644 index 0000000..b784c31 --- /dev/null +++ b/dev-lisp/sbcl/files/sbcl-1.1.18-graphiz-2.38.patch @@ -0,0 +1,19 @@ +--- sbcl-1.1.18/doc/internals/discriminating-functions.dot.old 2016-03-18 18:40:54.297597061 -0700 ++++ sbcl-1.1.18/doc/internals/discriminating-functions.dot 2016-03-18 18:41:29.912053235 -0700 +@@ -33,13 +33,13 @@ + // oneindex -> dispatch + // nn -> caching + // nn -> checking + // nn -> dispatch + +-subgraph class -> caching +-subgraph class -> checking +-subgraph class -> dispatch ++subgraph { class -> caching } ++subgraph { class -> checking } ++subgraph { class -> dispatch } + + initial -> oneclass + + initial -> default + initial -> nomethods diff --git a/dev-lisp/sbcl/sbcl-1.1.18-r1.ebuild b/dev-lisp/sbcl/sbcl-1.1.18-r1.ebuild new file mode 100644 index 0000000..f3cdce6 --- /dev/null +++ b/dev-lisp/sbcl/sbcl-1.1.18-r1.ebuild @@ -0,0 +1,218 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit multilib eutils flag-o-matic pax-utils + +#same order as http://www.sbcl.org/platform-table.html +BV_X86=1.0.58 +BV_AMD64=1.1.18 +BV_PPC=1.0.28 +BV_SPARC=1.0.28 +BV_ALPHA=1.0.28 + +DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp" +HOMEPAGE="http://sbcl.sourceforge.net/" +SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2 + x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 ) + amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 ) + ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 ) + sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 ) + alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 )" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" +IUSE="debug doc source +threads +unicode pax_kernel zlib" + +CDEPEND="=dev-lisp/asdf-3.0*:=" +DEPEND="${CDEPEND} + doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 ) + pax_kernel? ( sys-apps/paxctl sys-apps/elfix )" +RDEPEND="${CDEPEND} + elibc_glibc? ( >=sys-libs/glibc-2.6 )" + +# Disable warnings about executable stacks, as this won't be fixed soon by upstream +QA_EXECSTACK="usr/bin/sbcl" + +CONFIG="${S}/customize-target-features.lisp" +ENVD="${T}/50sbcl" + +# Prevent ASDF from using the system libraries +CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" +ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" + +usep() { + use ${1} && echo "true" || echo "false" +} + +sbcl_feature() { + echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}" +} + +sbcl_apply_features() { + sed 's/^X//' > "${CONFIG}" <<-'EOF' + (lambda (list) + X (flet ((enable (x) (pushnew x list)) + X (disable (x) (setf list (remove x list)))) + EOF + if use x86 || use amd64; then + sbcl_feature "$(usep threads)" ":sb-thread" + fi + sbcl_feature "true" ":sb-ldb" + sbcl_feature "false" ":sb-test" + sbcl_feature "$(usep unicode)" ":sb-unicode" + sbcl_feature "$(usep zlib)" ":sb-core-compression" + sbcl_feature "$(usep debug)" ":sb-xref-for-internals" + sed 's/^X//' >> "${CONFIG}" <<-'EOF' + X ) + X list) + EOF + cat "${CONFIG}" +} + +src_unpack() { + unpack ${A} + mv sbcl-*-linux sbcl-binary || die + cd "${S}" +} + +src_prepare() { + epatch "${FILESDIR}"/gentoo-fix_install_man.patch + epatch "${FILESDIR}"/gentoo-fix_linux-os-c.patch + # bug #468482 + epatch "${FILESDIR}"/concurrency-test.patch + # bug #486552 + epatch "${FILESDIR}"/bsd-sockets-test.patch + # bug #577514 + epatch "${FILESDIR}"/sbcl-1.1.18-graphiz-2.38.patch + + # To make the hardened compiler NOT compile with -fPIE -pie + if gcc-specs-pie ; then + einfo "Disabling PIE..." + epatch "${FILESDIR}"/${PN}-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch + fi + + # bug #526194 + sed -e "s@CFLAGS =@CFLAGS = ${CFLAGS}@" \ + -e "s@LINKFLAGS =@LINKFLAGS = ${LDFLAGS}@" \ + -i src/runtime/GNUmakefile || die + + cp /usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die + + use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk + + # Some shells(such as dash) don't have "time" as builtin + # and we don't want to DEPEND on sys-process/time + sed "s,^time ,," -i make.sh || die + sed "s,/lib,/$(get_libdir),g" -i install.sh || die + # #define SBCL_HOME ... + sed "s,/usr/local/lib,/usr/$(get_libdir),g" -i src/runtime/runtime.c || die + + # Avoid sandbox violation, bug #572478 + sed -i -e "/(sb-posix:rmdir /s%\"/\"%\"${WORKDIR}\"%" \ + contrib/sb-posix/posix-tests.lisp || die + + find . -type f -name .cvsignore -delete +} + +src_configure() { + # customizing SBCL version as per + # http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup + echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr + + # applying customizations + sbcl_apply_features +} + +src_compile() { + local bindir="${WORKDIR}"/sbcl-binary + + strip-unsupported-flags ; filter-flags -fomit-frame-pointer + + if host-is-pax ; then + # To disable PaX on hardened systems + pax-mark -mr "${bindir}"/src/runtime/sbcl + + # Hack to disable PaX on second GENESIS stage + sed -i -e '/^echo \/\/doing warm init - compilation phase$/a\paxmark.sh -mr \.\/src\/runtime\/sbcl' \ + "${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime" + fi + + # clear the environment to get rid of non-ASCII strings, see bug 174702 + # set HOME for paludis + env - HOME="${T}" \ + CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \ + CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \ + GNUMAKE=make ./make.sh \ + "sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \ + || die "make failed" + + # need to set HOME because libpango(used by graphviz) complains about it + if use doc; then + env - HOME="${T}" \ + CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \ + ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \ + make -C doc/manual info html || die "Cannot build manual" + env - HOME="${T}" \ + CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \ + ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \ + make -C doc/internals info html || die "Cannot build internal docs" + fi +} + +src_test() { + ewarn "Unfortunately, it is known that some tests fail eg." + ewarn "run-program.impure.lisp. This is an issue of the upstream's" + ewarn "development and not of Gentoo's side. Please, before filing" + ewarn "any bug(s) search for older submissions. Thank you." + time ( cd tests && sh run-tests.sh ) +} + +src_install() { + # install system-wide initfile + dodir /etc/ + sed 's/^X//' > "${D}"/etc/sbclrc <<-EOF + ;;; The following is required if you want source location functions to + ;;; work in SLIME, for example. + X + (setf (logical-pathname-translations "SYS") + X '(("SYS:SRC;**;*.*.*" #p"/usr/$(get_libdir)/sbcl/src/**/*.*") + X ("SYS:CONTRIB;**;*.*.*" #p"/usr/$(get_libdir)/sbcl/**/*.*"))) + X + ;;; Setup ASDF2 + (load "/etc/common-lisp/gentoo-init.lisp") + EOF + + # Install documentation + unset SBCL_HOME + INSTALL_ROOT="${D}/usr" LIB_DIR="/usr/$(get_libdir)" DOC_DIR="${D}/usr/share/doc/${PF}" \ + sh install.sh || die "install.sh failed" + + # rm empty directories lest paludis complain about this + find "${D}" -empty -type d -exec rmdir -v {} + + + if use doc; then + dohtml -r doc/manual/ + doinfo doc/manual/*.info* + dohtml -r doc/internals/sbcl-internals + doinfo doc/internals/sbcl-internals.info + docinto internals-notes && dodoc doc/internals-notes/* + else + rm -Rv "${D}/usr/share/doc/${PF}" || die + fi + + dodoc BUGS CREDITS INSTALL NEWS OPTIMIZATIONS PRINCIPLES README TLA TODO + + # install the SBCL source + if use source; then + ./clean.sh + cp -av src "${D}/usr/$(get_libdir)/sbcl/" || die + fi + + # necessary for running newly-saved images + echo "SBCL_HOME=/usr/$(get_libdir)/${PN}" > "${ENVD}" + echo "SBCL_SOURCE_ROOT=/usr/$(get_libdir)/${PN}/src" >> "${ENVD}" + doenvd "${ENVD}" +}