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 EDC5D1382C5 for ; Wed, 31 Mar 2021 09:55:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3F7F0E0827; Wed, 31 Mar 2021 09:55:46 +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 174C4E0827 for ; Wed, 31 Mar 2021 09:55:46 +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 B7F0433BE6D for ; Wed, 31 Mar 2021 09:55:44 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D1CEA5B8 for ; Wed, 31 Mar 2021 09:55:42 +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: <1617184513.402e0e21f201f6d81f5eccd2d17f91dd14fb9734.grozin@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lisp/sbcl/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lisp/sbcl/Manifest dev-lisp/sbcl/sbcl-2.1.3.ebuild X-VCS-Directories: dev-lisp/sbcl/ X-VCS-Committer: grozin X-VCS-Committer-Name: Andrey Grozin X-VCS-Revision: 402e0e21f201f6d81f5eccd2d17f91dd14fb9734 X-VCS-Branch: master Date: Wed, 31 Mar 2021 09:55:42 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d480b71f-e7c4-4371-b0e5-b0c1ac924254 X-Archives-Hash: f8d12fadd2d6fad3f3d76576429a9c50 commit: 402e0e21f201f6d81f5eccd2d17f91dd14fb9734 Author: Andrey Grozin gentoo org> AuthorDate: Wed Mar 31 09:55:13 2021 +0000 Commit: Andrey Grozin gentoo org> CommitDate: Wed Mar 31 09:55:13 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=402e0e21 dev-lisp/sbcl: bump to 2.1.3 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andrey Grozin gentoo.org> dev-lisp/sbcl/Manifest | 2 + dev-lisp/sbcl/sbcl-2.1.3.ebuild | 245 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 247 insertions(+) diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest index ac0224ae896..29fabbf11da 100644 --- a/dev-lisp/sbcl/Manifest +++ b/dev-lisp/sbcl/Manifest @@ -26,3 +26,5 @@ DIST sbcl-2.1.1-source.tar.bz2 6543910 BLAKE2B a567e30ea03d2a19f85afeda385d1d8af DIST sbcl-2.1.1-x86-64-linux-binary.tar.bz2 10116591 BLAKE2B f9e4d2772b23cf03af6f7e8a44192bc48269990c4c7f4a89885497044855f8b637346704aafef54998942184bd58eeb1775cb2e8ef147b4d470cbbc7d44b8773 SHA512 0bf5e8e50e172debba70216e207a8b7d0caf53ccc8d2e682f52622740dfda2320d7c69fa5f966e5c4a5838252447f3704d6b31d0dfaf0b95503ec38c5d18afca DIST sbcl-2.1.2-source.tar.bz2 6539563 BLAKE2B 601331d82c00a153bf7a8e5c556aea1e03eabf9bcd6c6ff874b3e96e3cf96aa8f780297eed3c87411fc1902a0ec36ee9a6b8b8ce51a4a6a8d8f0aa3491270c7e SHA512 53b7be18753bf6e2a4811d47afee3a7b1ece9c1205f73d783880f420870b784a34c07320575a1b5c6bbaf3eca2f7a82f51382f857b6a27fc19e02348ea8bdd70 DIST sbcl-2.1.2-x86-64-linux-binary.tar.bz2 10131524 BLAKE2B 7edb4be77623ac09e650716026f1ecdc8808e9545a658b6c7ebdf0d13ea147217b65f35cfccc3682f303638ef672b822112d13c25cc809ec9b153eaaa7003085 SHA512 e491905fe4929b2dd35080acc1d67f03e7584c36580334be995f6eeec144a87d7c32f19bcc84bcb14fc3157fce0bdc37b7f1f531b1873b1bbddf365932542385 +DIST sbcl-2.1.3-source.tar.bz2 6546338 BLAKE2B 7253a97fe57c9f3bfd3fd094d75dd1d028c077272cb3f1ae76935736ec69fc7b0d94568dfa1ec8000aaf72ececb505d84650b2a7350af617bfab5cce514ac253 SHA512 bd3d66d4257200a14fd0ac350aea8c26dcfd5d3f9d00a2175f5714ed8179e293e1687fc50b79ca111df7f24fb65804fdf220faaad5c1c76886f5c181af36b5d5 +DIST sbcl-2.1.3-x86-64-linux-binary.tar.bz2 10141041 BLAKE2B 724786d03e53b86da38cff705d3d3c3b13cbd92375a3841bbf5f1e410d765b7ca4c451e73c4f6f46dd813d4e121f4b641ac70e8cf88599c157bb66c4d3e40b9d SHA512 9209ecaedab3fc16b877970dc72f6cbf611906cb25e6980fedd7234990f5d2b4b49572942e6a11f638688802dc804b27e114877fd1d17478db9441593629e70e diff --git a/dev-lisp/sbcl/sbcl-2.1.3.ebuild b/dev-lisp/sbcl/sbcl-2.1.3.ebuild new file mode 100644 index 00000000000..1f6c1176319 --- /dev/null +++ b/dev-lisp/sbcl/sbcl-2.1.3.ebuild @@ -0,0 +1,245 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit multilib eutils flag-o-matic pax-utils toolchain-funcs + +#same order as http://www.sbcl.org/platform-table.html +BV_X86=1.4.3 +BV_AMD64=2.1.3 +BV_PPC=1.2.7 +BV_SPARC=1.0.28 +BV_ALPHA=1.0.28 +BV_ARM=1.4.11 +BV_ARM64=1.4.2 +BV_X64_MACOS=1.2.11 +BV_PPC_MACOS=1.0.47 +BV_X86_SOLARIS=1.2.7 +BV_X64_SOLARIS=1.2.7 +BV_SPARC_SOLARIS=1.0.23 + +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 ) + arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 ) + arm64? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM64}-arm64-linux-binary.tar.bz2 ) + x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 ) + ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 ) + x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 ) + x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 ) + sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 )" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris" +IUSE="debug doc source +threads +unicode pax_kernel zlib" + +CDEPEND=">=dev-lisp/asdf-3.3:=" +DEPEND="${CDEPEND} + doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 ) + pax_kernel? ( sys-apps/elfix )" +RDEPEND="${CDEPEND} + !prefix? ( 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-*-* sbcl-binary || die + cd "${S}" +} + +src_prepare() { + # bug #468482 + eapply "${FILESDIR}"/concurrency-test-2.0.1.patch + # bugs #486552, #527666, #517004 + eapply "${FILESDIR}"/bsd-sockets-test-2.0.5.patch + # bugs #560276, #561018 + eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch + # bug #767742 + eapply "${FILESDIR}"/etags-2.1.0.patch + + eapply "${FILESDIR}"/verbose-build-2.0.3.patch + + eapply_user + + # Make sure the *FLAGS variables are sane. + # sbcl needs symbols in resulting binaries, so building with the -s linker flag will fail. + strip-unsupported-flags + filter-flags -fomit-frame-pointer -Wl,-s + filter-ldflags -s + + # original bugs #526194, #620532 + # this broke no-pie default builds, c.f. bug #632670 + # Pass CFLAGS down by appending our value, to let users override + # the default values. + # Keep passing LDFLAGS down via the LINKFLAGS variable. + sed -e "s@\(CFLAGS += -g .*\)\$@\1 ${CFLAGS}@" \ + -e "s@LINKFLAGS += -g\$@LINKFLAGS += ${LDFLAGS}@" \ + -i src/runtime/GNUmakefile || die + + sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \ + -i make-config.sh || die + + # Use installed ASDF version + cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die + # Avoid installation of ASDF info page. See bug #605752 + sed '/INFOFILES/s/asdf.info//' -i doc/manual/Makefile || 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,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die + # change location of /etc/sbclrc ... + sed "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.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 + + if use pax_kernel ; 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 '/^[ \t]*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}" PATH="${PATH}" \ + 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}" PATH="${PATH}" \ + 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}" PATH="${PATH}" \ + 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//' > "${ED}"/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"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*") + X ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*"))) + X + ;;; Setup ASDF2 + (load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp") + EOF + + # Install documentation + unset SBCL_HOME + INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \ + sh install.sh || die "install.sh failed" + + # bug #517008 + pax-mark -mr "${D}"/usr/bin/sbcl + + # rm empty directories lest paludis complain about this + find "${ED}" -empty -type d -exec rmdir -v {} + + + if use doc; then + dodoc -r doc/internals/sbcl-internals + + doinfo doc/manual/*.info* + doinfo doc/internals/sbcl-internals.info + + docinto internals-notes + dodoc doc/internals-notes/* + else + rm -Rv "${ED}/usr/share/doc/${PF}" || die + fi + + # install the SBCL source + if use source; then + ./clean.sh + cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die + fi + + # necessary for running newly-saved images + echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}" + echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}" + doenvd "${ENVD}" +}