dev-lisp/sbcl: bump to 2.0.1
authorAndrey Grozin <grozin@gentoo.org>
Thu, 30 Jan 2020 15:38:47 +0000 (22:38 +0700)
committerAndrey Grozin <grozin@gentoo.org>
Thu, 30 Jan 2020 15:38:47 +0000 (22:38 +0700)
Package-Manager: Portage-2.3.85, Repoman-2.3.20
Signed-off-by: Andrey Grozin <grozin@gentoo.org>
dev-lisp/sbcl/Manifest
dev-lisp/sbcl/files/concurrency-test-2.0.1.patch [new file with mode: 0644]
dev-lisp/sbcl/sbcl-2.0.1.ebuild [new file with mode: 0644]

index 9430a65a39573a35d4d1494efc8c1a122a0029f1..e645b4d96f7bc517135f99cc01dbb70a6efb9c87 100644 (file)
@@ -24,3 +24,5 @@ DIST sbcl-1.5.8-source.tar.bz2 6409837 BLAKE2B cb503ee1db82f2e1a9c123b9b6b5052b2
 DIST sbcl-1.5.8-x86-64-linux-binary.tar.bz2 10145219 BLAKE2B aeccd48a5448e334d6cf3ca4e067ac23943256c2a729ff24b6b3c332c6c70c108b68a6903193a403176d4fbf4804c9f22add615e29fa09022f84b0190a429454 SHA512 d733929775be6fe5d46fd5b11c808eae89172a5a8694f1c2a7927cc364419529292d70f6902731f4c7822c85708555382de31b605440493bb281ccef552daf6c
 DIST sbcl-2.0.0-source.tar.bz2 6457217 BLAKE2B ae09d4d80ca7100fb412be570126918612eb5a3f27a8c17ced4e0c555d105f3180999f2663ea86910dda9d812d4297cceb8d7c43d5084d20902839e1f23bc739 SHA512 e458e11af6703d8cff973cf5167866b93fe5f6e1b2df3cbf0c1beb014eef2d737d83fc9cde5745d476ef5397a2c9b4b4148d2b77ebbcec13e0f284b2e0900906
 DIST sbcl-2.0.0-x86-64-linux-binary.tar.bz2 10196560 BLAKE2B 161d53df96817a50606ffc6a5ad502a94a1aa622e0a45c17c4ff4148deafb2e1db560aacd33b1198eb6fd3bc462b320e01d4925097bec3954f9d6ce564a2b1f5 SHA512 23d3974656a33ae0cfce340e2fbdd60a4e595353e7cc6e75dbab0242d7baaa30d677d1163d4440e953cd7f859fc737b073055b68fbeb2e57e3542a0133d7648f
+DIST sbcl-2.0.1-source.tar.bz2 6466983 BLAKE2B f040fb288f5b7adb8a7f56aae60a37e38034c2fed958b1361f473096769367b0a10a76a0e45380e6dcf3b4bd2c1038957448f70eede38b04c228a14e3afc1fc2 SHA512 1d92589033e123c21377f820dbc22e27f2610a372c5545799bec7c247795ba4b8b65102c7fe739f4a15a84579ec72f63fb9f4b197db5c6da1f8d59bd35966bea
+DIST sbcl-2.0.1-x86-64-linux-binary.tar.bz2 10151722 BLAKE2B 445fcaa5a6f1c2a7a7d80dd28d1126c33437af2a59dadd25cbbe9ca4e12488a985e78aa12095fda8e38e21dceca77a0e1bca0949133b0ac2666d4367bf881f68 SHA512 1d24981b42c5d91f6037ad6fed782786bbc75edcb2f125a6d5b793448d00c211af515f56b6dd70a68bd33ea7174fd1d96ef9ab353c96905835b6299dcb170f47
diff --git a/dev-lisp/sbcl/files/concurrency-test-2.0.1.patch b/dev-lisp/sbcl/files/concurrency-test-2.0.1.patch
new file mode 100644 (file)
index 0000000..e0a36a8
--- /dev/null
@@ -0,0 +1,12 @@
+diff -r -U3 sbcl-2.0.1.orig/contrib/sb-concurrency/tests/test-frlock.lisp sbcl-2.0.1/contrib/sb-concurrency/tests/test-frlock.lisp
+--- sbcl-2.0.1.orig/contrib/sb-concurrency/tests/test-frlock.lisp      2020-01-27 04:26:30.000000000 +0700
++++ sbcl-2.0.1/contrib/sb-concurrency/tests/test-frlock.lisp   2020-01-30 21:53:57.750913923 +0700
+@@ -88,7 +88,7 @@
+ #+sb-thread
+ (deftest* (frlock.1)
+     (handler-case
+-        (sb-ext:with-timeout 40
++        (sb-ext:with-timeout 240
+           (test-frlocks #+win32 :outer-write-pause #+win32 t ))
+       (sb-ext:timeout (c)
+         (error "~A" c)))
diff --git a/dev-lisp/sbcl/sbcl-2.0.1.ebuild b/dev-lisp/sbcl/sbcl-2.0.1.ebuild
new file mode 100644 (file)
index 0000000..05eaaf6
--- /dev/null
@@ -0,0 +1,246 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib eutils flag-o-matic pax-utils
+
+#same order as http://www.sbcl.org/platform-table.html
+BV_X86=1.4.3
+BV_AMD64=2.0.1
+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_X86_MACOS=1.1.6
+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 )
+       x86-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_MACOS}-x86-darwin-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-macos ~x86-solaris"
+IUSE="debug doc source +threads +unicode pax_kernel zlib"
+
+CDEPEND=">=dev-lisp/asdf-3.1:="
+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}"/${PN}-1.4.0-bsd-sockets-test.patch
+       # bugs #560276, #561018
+       eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch
+
+       eapply "${FILESDIR}"/${PN}-1.2.11-solaris.patch
+       eapply "${FILESDIR}"/${PN}-1.4.0-verbose-build.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}"
+}