这是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.

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

Conversation

robertkirkman
Copy link
Contributor

  • Fixes Auto update failing for sbcl #24526

  • The auto update failed to proceed because I put the host SBCL download in termux_download instead of TERMUX_PKG_SRCURL and I forgot I did that,

  • However, there are some changes near areas patched by patch files, so the patches have to be rebased anyway

  • disable-failing-tests-that-were-only-enabled-on-x86.patch: In sbcl/sbcl@b219fb3, upstream disabled the failing x86-only test by commenting it out, but in rebasing, I have preserved the hunk to disable it on Android should it ever be enabled again upstream, as a reminder for the future that this test was failing on Android-x86 and might need to remain disabled even if upstream enables it again in the future.

  • pass-testsuite-on-device.patch: Upstream decided to add a null return check to the implementation of sb-unix:unix-tmpfile() as a result of discussion that was, in fact, related to its test failing on Termux shortly prior to the addition of sbcl to termux-packages, and that is OK and should not have any major effect on the tests we run here, because of our termux_tmpfile() implementation preventing it from returning null in most situations.

- Fixes termux#24526

- The auto update failed to proceed because I put the host SBCL download in `termux_download` instead of `TERMUX_PKG_SRCURL` and I forgot I did that,

- However, there are some changes near areas patched by patch files, so the patches have to be rebased anyway

- `disable-failing-tests-that-were-only-enabled-on-x86.patch`: In sbcl/sbcl@b219fb3, upstream disabled the failing x86-only test by commenting it out, but in rebasing, I have preserved the hunk to disable it on Android should it ever be enabled again upstream, as a reminder for the future that this test was failing on Android-x86 and might need to remain disabled even if upstream enables it again in the future.

- `pass-testsuite-on-device.patch`: Upstream decided to add a null return check to the implementation of `sb-unix:unix-tmpfile()` as a result of discussion that was, in fact, related to its test failing on Termux shortly prior to the addition of `sbcl` to termux-packages, and that is OK and should not have any major effect on the tests we run here, because of our `termux_tmpfile()` implementation preventing it from returning null in most situations.
@robertkirkman
Copy link
Contributor Author

Tomjo2000, do you think that after

the way I have written this TERMUX_PKG_SRCURL here (array) will start working in the auto updater, and is that PR necessary for it to work?

@TomJo2000
Copy link
Member

Yeah that should work.
TERMUX_PKG_SRCURL isn't modified by the auto updates.

I've been working on #23678 but it's tricky and has a lot of edgecases.
You might have seen some of the madness with the "auto-patcher" I wrote to handle all the edgecases for this earlier.
I have a regex with actual unit tests for grabbing the SHA256 sums.
https://regex101.com/r/oO6qSj/2

This should also work on TERMUX_PKG_VERSION.

@robertkirkman
Copy link
Contributor Author

Ok, I will merge this in 24 hours from now if there are no other comments.

@robertkirkman robertkirkman merged commit ad4b6d6 into termux:master May 6, 2025
9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Auto update failing for sbcl
2 participants