commit: 10705be48b000859ff971ace994594a58f46ed7c Author: Andrey Grozin <grozin <AT> gentoo <DOT> org> AuthorDate: Mon Nov 3 15:13:55 2025 +0000 Commit: Andrey Grozin <grozin <AT> gentoo <DOT> org> CommitDate: Mon Nov 3 15:13:55 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10705be4
dev-lisp/sbcl: bump to 2.5.10 Signed-off-by: Andrey Grozin <grozin <AT> gentoo.org> dev-lisp/sbcl/Manifest | 2 + dev-lisp/sbcl/files/concurrency-test-2.5.10.patch | 12 + dev-lisp/sbcl/sbcl-2.5.10.ebuild | 275 ++++++++++++++++++++++ 3 files changed, 289 insertions(+) diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest index 29dce7897065..d228d698b428 100644 --- a/dev-lisp/sbcl/Manifest +++ b/dev-lisp/sbcl/Manifest @@ -9,6 +9,8 @@ DIST sbcl-1.4.2-arm64-linux-binary.tar.bz2 10578821 BLAKE2B 1cd25c548be0f1b7ec01 DIST sbcl-1.4.3-x86-linux-binary.tar.bz2 10227185 BLAKE2B 6d77c4f4177cbdb72fb9bab0da5bd91e0aa8deafffd238818a2551332f0ab246715d9489b5c1156f3481aa7fb79d161a988404620fc09fe86ff927543a1ee678 SHA512 41cd63d61dd7c46370341dce39a362287a23b528bfebe8e5571614aeefdea03d318207d25562e995db9ccedb6c1f50ea4d66627721f0fd9486e99440126e6a38 DIST sbcl-1.5.8-ppc64le-linux-binary.tar.bz2 10025597 BLAKE2B aac079e3585ebe9d5b610cf096e958edfd4410361b0d96b2fa88a285cbdce4133d89e1ddf0cf6729d43d6c3057365d07a3d73362f906fd8798b76c993210a8e5 SHA512 443ab604caa768c756f3322d7c599142a50227914bcd6be12434432daf1e3d5af0740d1ebdb166b856cc77ddf02451e29fcef9e29099f7bc4fb49ad61db17674 DIST sbcl-2.3.3-armhf-linux-binary.tar.bz2 9932803 BLAKE2B 77e0da4a60fd74caaef3adbf29446a50323c18433cc36418d9e670e410882137cdd482ef4b2da989190c27d1cc737dba0848ad652044832337e39243088813f3 SHA512 b9810c2fe9f34ee974cb90b3b79dbb4c77053300fd029eae216fbb2772da539f2b71ca13c868772adf618f364fc73994a3a467e0a535fe5195b7eb6b0fee3571 +DIST sbcl-2.5.10-source.tar.bz2 8310771 BLAKE2B cb6548ba4974dc7a864f255faa8b0cb7e47957929788a6227feb0ce17a091f4c4adb0b5f46d90f7a86425c75e8647dd634578c8d2f765243e6b6bb5c91b73884 SHA512 7674c933a4853b83365b2dd84c31f83fe9f8be176edb2f145866eddd33af012e90903c825ade9b055336b683c1fffa4094f02c1393699bcac190d75f9cab7891 +DIST sbcl-2.5.10-x86-64-linux-binary.tar.bz2 12161165 BLAKE2B 773920a4067b9e3bf678dc65d4633880e090d8ee2e8037b30c4d8776a578570a58a7ab0e8fe1e095dfd804894590cad8bc6340b6b1deee4b11d48fe23c9d30fc SHA512 7c848694878705126969677eba7babdd8bf5907dabf89842bc0273a583b5bf81f664658cb7c2a7022101027f1518e08ebe2346bad5b453847eb7e8c01765cedf DIST sbcl-2.5.4-source.tar.bz2 8252514 BLAKE2B 9953e7ecfbef7fda728747d5aade2bc16074578bd7d07924e150f88072fb0ecbcf54a1a8a8e7f8bb4590186a8c639f240e74ebb5b4ebb6626ac7c1b7f8fd39e7 SHA512 f0e6c25c37d7c83c0ee8ae94f78438b2c0ed6491f080afec84c5cd7bc1eb65ba43982d8092b637b77d8764d6cb0de4b337c250f840184f27fe21e3944fdce31c DIST sbcl-2.5.4-x86-64-linux-binary.tar.bz2 12030625 BLAKE2B eb176f3e16158e5afd44634b7e69229acb84ae799997e5504c328dc9d92fe378fbcc5ffa9f65441d63a7b7f02d9dd1547ff8f91ae9afb3328b704b28707b796d SHA512 fa962120a2f806289c6c8b60d40b9f6fd5c852d2dec48f0546780be7f4aa5d64e337924074e61573b38587839597398e82a2988aae579b7163960bb45466e4a2 DIST sbcl-2.5.7-source.tar.bz2 8276880 BLAKE2B a8a244a902db059f11370205f4f8ab17206729b77bf3c41db9e2ad0a547e73becfbf66cc78bcce4181cb396ea6caf69d4760ae06142c0ab284af3035f77f0020 SHA512 f4babb473b0469d1f0343cd5cc79b091de4f2815635277ded95988c60ac53be02ec1916149ca989bbeb521e63fb40793de7e27530cb5a23f188e7b94e642b982 diff --git a/dev-lisp/sbcl/files/concurrency-test-2.5.10.patch b/dev-lisp/sbcl/files/concurrency-test-2.5.10.patch new file mode 100644 index 000000000000..3926114adbb2 --- /dev/null +++ b/dev-lisp/sbcl/files/concurrency-test-2.5.10.patch @@ -0,0 +1,12 @@ +diff '--color=auto' -r -U3 sbcl-2.5.10.orig/contrib/sb-concurrency/tests/test-frlock.lisp sbcl-2.5.10/contrib/sb-concurrency/tests/test-frlock.lisp +--- sbcl-2.5.10.orig/contrib/sb-concurrency/tests/test-frlock.lisp 2025-10-28 00:13:20.000000000 +0700 ++++ sbcl-2.5.10/contrib/sb-concurrency/tests/test-frlock.lisp 2025-11-01 19:10:56.810091410 +0700 +@@ -83,7 +83,7 @@ + #+sb-thread + (deftest frlock.1 + (handler-case +- (sb-ext:with-timeout (* 40 #+gc-stress 10) ++ (sb-ext:with-timeout (* 240 #+gc-stress 10) + (test-frlocks #+win32 :outer-write-pause #+win32 t )) + (sb-ext:timeout (c) + (error "~A" c))) diff --git a/dev-lisp/sbcl/sbcl-2.5.10.ebuild b/dev-lisp/sbcl/sbcl-2.5.10.ebuild new file mode 100644 index 000000000000..6ffe6f1822cd --- /dev/null +++ b/dev-lisp/sbcl/sbcl-2.5.10.ebuild @@ -0,0 +1,275 @@ +# Copyright 1999-2025 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.5.10 +BV_PPC=1.2.7 +BV_PPC64LE=1.5.8 +BV_SPARC=1.0.28 +BV_ALPHA=1.0.28 +BV_ARM=2.3.3 +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/ https://sbcl.sourceforge.net/"; +BSD_SOCKETS_TEST_PATCH=bsd-sockets-test-2.3.6.patch +SRC_URI="https://downloads.sourceforge.net/sbcl/${P}-source.tar.bz2 + https://dev.gentoo.org/~grozin/${BSD_SOCKETS_TEST_PATCH}.gz + !system-bootstrap? ( + x86? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 ) + amd64? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 ) + ppc? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 ) + ppc64? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_PPC64LE}-ppc64le-linux-binary.tar.bz2 ) + sparc? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 ) + alpha? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 ) + arm? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 ) + arm64? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_ARM64}-arm64-linux-binary.tar.bz2 ) + x64-macos? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 ) + ppc-macos? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 ) + x64-solaris? ( https://downloads.sourceforge.net/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 ) + )" + +LICENSE="MIT" +SLOT="0/${PV}" +KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +IUSE="system-bootstrap debug doc source +threads +unicode +zstd" + +CDEPEND=">=dev-lisp/asdf-3.3:= \ + prefix? ( dev-util/patchelf )" +# bug #843851 +BDEPEND="${CDEPEND} + dev-debug/strace + doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 ) + system-bootstrap? ( || ( >=dev-lisp/ecl-24.5.10 dev-lisp/clisp dev-lisp/sbcl ) )" +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} + if ! use system-bootstrap ; then + mv sbcl-*-* sbcl-binary || die + fi + cd "${S}" +} + +src_prepare() { + # bug #468482 + eapply "${FILESDIR}"/concurrency-test-2.5.10.patch + # bugs #486552, #527666, #517004 + eapply "${WORKDIR}"/${BSD_SOCKETS_TEST_PATCH} + # bugs #560276, #561018 + eapply "${FILESDIR}"/sb-posix-test-2.5.0.patch + # bug #767742 + eapply "${FILESDIR}"/etags-2.1.0.patch + # Use ${PV} as build-id, bug #797574 + eapply "${FILESDIR}"/build-id-2.4.3.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 + + # set interpreter for Prefix + if use prefix ; then + patchelf --set-interpreter \ + "${EPREFIX}/$(get_libdir)"/ld-linux-x86-64.so.2 \ + "${WORKDIR}"/sbcl-binary/src/runtime/sbcl + fi + + # applying customizations + sbcl_apply_features +} + +src_compile() { + local bindir="${WORKDIR}"/sbcl-binary + local bootstrap_lisp="sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" + + if use system-bootstrap ; then + if has_version "dev-lisp/sbcl" ; then + bootstrap_lisp="sbcl --no-sysinit --no-userinit --disable-debugger" + elif has_version "dev-lisp/ecl" ; then + bootstrap_lisp="ecl" + elif has_version "dev-lisp/clisp" ; then + bootstrap_lisp="clisp" + else + die "could not find a bootstrap_lisp" + fi + fi + + # Bug #869434 + append-cppflags -D_GNU_SOURCE + + # 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}" \ + SBCL_HOME="/usr/$(get_libdir)/sbcl" SBCL_SOURCE_ROOT="/usr/$(get_libdir)/sbcl/src" \ + GNUMAKE=make PV=${PV} ./make.sh \ + "${bootstrap_lisp}" \ + || 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}" +}
