commit: d57dfaa4d8824baf5ec016900d4b3137b094948b Author: Andrey Grozin <grozin <AT> gentoo <DOT> org> AuthorDate: Sat Oct 1 10:20:04 2022 +0000 Commit: Andrey Grozin <grozin <AT> gentoo <DOT> org> CommitDate: Sat Oct 1 10:20:04 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d57dfaa4
dev-lisp/sbcl: bump to 2.2.9 Signed-off-by: Andrey Grozin <grozin <AT> gentoo.org> dev-lisp/sbcl/Manifest | 2 + dev-lisp/sbcl/files/sb-posix-test-2.2.9.patch | 30 ++++ dev-lisp/sbcl/sbcl-2.2.9.ebuild | 245 ++++++++++++++++++++++++++ 3 files changed, 277 insertions(+) diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest index 70071b788656..40bf28839341 100644 --- a/dev-lisp/sbcl/Manifest +++ b/dev-lisp/sbcl/Manifest @@ -20,3 +20,5 @@ DIST sbcl-2.2.6-source.tar.bz2 7128448 BLAKE2B 7b7c996c175e9a06ca3b1cc40834d8d97 DIST sbcl-2.2.6-x86-64-linux-binary.tar.bz2 11670931 BLAKE2B b878bed6f948dfdedb10a755887da386dbdf8b8c69d9a0051c7fd1bbba0cf30c87b7863f424cb744eb4d1d5482158f96cfb9000b84bbad208619fa875593c9b1 SHA512 22a14422dc5ec06501471b741ccca1d9a03f6061ccdb2175c75eb452cff3edf561e6804660ca179d269642e09854268fd4f158834c17e39ec95e568f26a2eeaa DIST sbcl-2.2.8-source.tar.bz2 7263357 BLAKE2B fa8ba5664e22cb4856bf6e96d2d84e8a639eea0d9bb639cf049fd0d22260038b601eacfe9f5f84f8d38fb04af7e77a5733b122936833f77821d9321ddd2eb2b2 SHA512 2de8c096b964bfe2136ab30c3342fab154c1795e0ee1fc6ca2ae713da3c139ce066f37886e1f1b18d8e17ea4cbaf949e66960134505233ef9c7bb5bb902a6c52 DIST sbcl-2.2.8-x86-64-linux-binary.tar.bz2 11685573 BLAKE2B 3291840b2597ce37c70e8e894bf0c4dd9e1dcea619a18dee90e55b4a05dbe82267acdb289b20c3cb9be6987f551f28c410b6e03f58a9a0c01426eba1583107f0 SHA512 db1b81b603cdf6b76147d13502d3c152b8a78c2119b9df59a4e3705c93bc5ab208491a4ba19e28e31813e7da13d2d8d3a1a493dc86e143a5725bebffdc10e397 +DIST sbcl-2.2.9-source.tar.bz2 7258148 BLAKE2B ed7c220644120c467bcf2ef0a254b5065a6169d1560238dabbb4589831b2f094801b018d3b0bfc5e671328204ae34be763ec9df32ab7c5dcffd4860400582ae8 SHA512 6e215c7d34fe0db681b558206061f40bc1e235a0c2eb39518811bf2803e6a91f220b36e25da408a6756fd84071b6d634dc41e4acba73fdb0ffbab2cd77c9a8db +DIST sbcl-2.2.9-x86-64-linux-binary.tar.bz2 11641067 BLAKE2B 4afeb6c3dee6d0b13790b005882d0702978f039feb3dd85fc483282b04b40ee797f8506f2db1611abf148589215583640f02022a11d4e01e854bd4a566fdd48e SHA512 53f9da74dd18056cf086e2f2258949eb53cdaabe9b3f24b004378e65c7a3ae5821a8501868415d662fc24d59bd0edb2c3b67419ebe48d459e8546e17fb692400 diff --git a/dev-lisp/sbcl/files/sb-posix-test-2.2.9.patch b/dev-lisp/sbcl/files/sb-posix-test-2.2.9.patch new file mode 100644 index 000000000000..f88f13301dfd --- /dev/null +++ b/dev-lisp/sbcl/files/sb-posix-test-2.2.9.patch @@ -0,0 +1,30 @@ +diff -r -U2 sbcl-2.2.9.orig/contrib/sb-posix/posix-tests.lisp sbcl-2.2.9/contrib/sb-posix/posix-tests.lisp +--- sbcl-2.2.9.orig/contrib/sb-posix/posix-tests.lisp 2022-09-29 14:43:33.000000000 +0700 ++++ sbcl-2.2.9/contrib/sb-posix/posix-tests.lisp 2022-10-01 16:32:39.919563905 +0700 +@@ -166,15 +166,15 @@ + #.sb-posix::einval) + +-(deftest rmdir.error.3 +- (handler-case +- (sb-posix:rmdir #-win32 "/" #+win32 (sb-ext:posix-getenv "windir")) +- (sb-posix:syscall-error (c) +- (typep +- (sb-posix:syscall-errno c) +- `(member #+(or darwin openbsd freebsd) ,sb-posix:eisdir +- #+win32 ,sb-posix::eacces #+win32 ,sb-posix::enotempty +- #+sunos ,sb-posix::einval +- #-(or darwin openbsd freebsd win32 sunos) ,sb-posix::ebusy)))) +- t) ++; (deftest rmdir.error.3 ++; (handler-case ++; (sb-posix:rmdir #-win32 "/" #+win32 (sb-ext:posix-getenv "windir")) ++; (sb-posix:syscall-error (c) ++; (typep ++; (sb-posix:syscall-errno c) ++; `(member #+(or darwin openbsd freebsd) ,sb-posix:eisdir ++; #+win32 ,sb-posix::eacces #+win32 ,sb-posix::enotempty ++; #+sunos ,sb-posix::einval ++; #-(or darwin openbsd freebsd win32 sunos) ,sb-posix::ebusy)))) ++; t) + + (deftest rmdir.error.4 diff --git a/dev-lisp/sbcl/sbcl-2.2.9.ebuild b/dev-lisp/sbcl/sbcl-2.2.9.ebuild new file mode 100644 index 000000000000..ccbdd2a533cf --- /dev/null +++ b/dev-lisp/sbcl/sbcl-2.2.9.ebuild @@ -0,0 +1,245 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit 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.2.9 +BV_PPC=1.2.7 +BV_PPC64LE=1.5.8 +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="https://www.sbcl.org/ 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 ) + ppc64? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC64LE}-ppc64le-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 ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris" +IUSE="capstone debug doc source +threads +unicode +zstd" + +CDEPEND=">=dev-lisp/asdf-3.3:= + capstone? ( dev-libs/capstone:0/4 )" +# bug #843851 +BDEPEND="${CDEPEND} + doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )" +RDEPEND="${CDEPEND} + zstd? ( app-arch/zstd ) + !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 zstd)" ":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-2.2.9.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 + + use capstone || rm -rf contrib/sb-capstone + + 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 + + # 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 + for d in contrib/*/; do + cp -av "$d" "${ED}/usr/$(get_libdir)/sbcl/" || die + done + 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}" +}
