这是indexloc提供的服务，不要输入任何密码
Skip to content

bump(main/sbcl): 2.5.4 #24566

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 6, 2025
Merged

bump(main/sbcl): 2.5.4 #24566

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions packages/sbcl/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,16 @@ TERMUX_PKG_DESCRIPTION="A high performance Common Lisp compiler"
TERMUX_PKG_LICENSE="custom"
TERMUX_PKG_LICENSE_FILE="COPYING"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="2.5.3"
TERMUX_PKG_SRCURL="https://github.com/sbcl/sbcl/archive/refs/tags/sbcl-${TERMUX_PKG_VERSION}.tar.gz"
TERMUX_PKG_SHA256=f3b923778f7d1f151f2bdc08a0e92ec4f5a3db5efca5f46ea2ac439dda06cc35
TERMUX_PKG_VERSION="2.5.4"
# sourceforge archive is a precompiled SBCL release for GNU/Linux to use as host Lisp for bootstrapping
TERMUX_PKG_SRCURL=(
https://github.com/sbcl/sbcl/archive/refs/tags/sbcl-${TERMUX_PKG_VERSION}.tar.gz
https://sourceforge.net/projects/sbcl/files/sbcl/${TERMUX_PKG_VERSION}/sbcl-${TERMUX_PKG_VERSION}-x86-64-linux-binary.tar.bz2
)
TERMUX_PKG_SHA256=(
fa6120bd438387636d928b0306b189d142214010e2dacf5f67136c481ce84111
d71adcaf3e8db6702a3b04e310513294db898e8c11e20ae0ac6bccbb97b3e955
)
TERMUX_PKG_DEPENDS="zstd"
# TERMUX_ON_DEVICE_BUILD=true build dependencies: ecl, strace
# TERMUX_ON_DEVICE_BUILD=false build dependencies: aosp-libs, bash, coreutils, strace
Expand All @@ -27,16 +34,8 @@ termux_step_host_build() {
return
fi

# precompiled SBCL release for GNU/Linux to use as host Lisp for bootstrapping
SBCL_BINURL="https://sourceforge.net/projects/sbcl/files/sbcl/${TERMUX_PKG_VERSION}/sbcl-${TERMUX_PKG_VERSION}-x86-64-linux-binary.tar.bz2"
SBCL_BINARCHIVE="${TERMUX_PKG_CACHEDIR}/sbcl-${TERMUX_PKG_VERSION}-x86-64-linux-binary.tar.bz2"
SBCL_BINSHA256=e207fa6e851631dee0a467cea4f15276d31d4192c949a2b1d3d0daadbf70d443
SBCL_WORKDIR="${TERMUX_PKG_TMPDIR}/sbcl"
mkdir -p "$SBCL_WORKDIR"
termux_download "$SBCL_BINURL" "$SBCL_BINARCHIVE" "$SBCL_BINSHA256"
tar -xf "$SBCL_BINARCHIVE" --strip-components=1 -C "$SBCL_WORKDIR"
cd "${TERMUX_PKG_SRCDIR}/sbcl-${TERMUX_PKG_VERSION}-x86-64-linux"
export INSTALL_ROOT="$TERMUX_PKG_HOSTBUILD_DIR"
cd "$SBCL_WORKDIR"
sh install.sh
}

Expand Down
16 changes: 9 additions & 7 deletions packages/sbcl/disable-failing-tests-that-were-only-enabled-on-x86.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
elfcore.test.sh/elf-sans-immobile.test.sh is not passing on Android-x86,
so it is disabled by this. These tests also fail on ARM, but are
elfcore.test.sh is not passing on Android-x86,
so it is disabled by this. Upstream also currently has
elf-sans-immobile.test.sh disabled.
These tests also fail on ARM, but were
not enabled by upstream on any targets except 64-bit x86.
The exact reason why the test fails, or what steps might be necessary
to fix it, are not known, but one way of describing the probable
Expand All @@ -12,11 +14,11 @@ effects that this test failing implies would be:
. ./subr.sh

run_sbcl <<EOF
- #+(and linux x86-64 sb-thread)
+ #+(and linux x86-64 sb-thread (not android))
(unless (member :immobile-space sb-impl:+internal-features+)
(exit :code 0)) ; proceed with test
(exit :code 2) ; otherwise skip the test
-;#+(and linux x86-64 sb-thread)
+;#+(and linux x86-64 sb-thread (not android))
;(unless (member :immobile-space sb-impl:+internal-features+)
; (exit :code 0)) ; proceed with test
(exit :code 2) ; otherwise skip the test
--- a/tests/elfcore.test.sh
+++ b/tests/elfcore.test.sh
@@ -16,7 +16,7 @@
Expand Down
10 changes: 5 additions & 5 deletions packages/sbcl/pass-testsuite-on-device.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,11 @@ contains some code from https://bugs.launchpad.net/sbcl/+bug/1956852
;;; race conditions and (at least on Linux) does not make use of any shell environment variables
;;; to determine a directory - in fact it doesn't make a directory entry at all.
(defun sb-unix:unix-tmpfile ()
- (make-stdio-file (alien-funcall (extern-alien "tmpfile" (function system-area-pointer)))))
+ (make-stdio-file (alien-funcall (extern-alien "termux_tmpfile" (function system-area-pointer)))))

(defun sb-unix:unix-fclose (file)
(alien-funcall (extern-alien "fclose" (function int system-area-pointer))
- (let ((sap (alien-funcall (extern-alien "tmpfile" (function system-area-pointer)))))
+ (let ((sap (alien-funcall (extern-alien "termux_tmpfile" (function system-area-pointer)))))
(if (zerop (sap-int sap))
(error "Error calling tmpfile(): ~a" (strerror))
(make-stdio-file sap))))
--- a/src/runtime/linux-os.c
+++ b/src/runtime/linux-os.c
@@ -416,3 +416,8 @@ char *os_get_runtime_executable_path()
Expand Down