From b35a3bd71c7445689fec4a87e46f67e25bd6db44 Mon Sep 17 00:00:00 2001
From: Celeste <20312-Celeste@users.gitlab.alpinelinux.org>
Date: Fri, 31 Jan 2025 16:44:10 +0000
Subject: [PATCH] community/sbcl-stage0: upgrade to 2.5.1
https://sbcl.sourceforge.io/all-news.html#2.5.1
---
community/sbcl-stage0/APKBUILD | 8 ++++----
community/sbcl-stage0/musl-time64.patch | 20 +++++++++++++++++++
.../xperfecthash30-missing-entries-x86.patch | 13 ------------
3 files changed, 24 insertions(+), 17 deletions(-)
create mode 100644 community/sbcl-stage0/musl-time64.patch
delete mode 100644 community/sbcl-stage0/xperfecthash30-missing-entries-x86.patch
diff --git a/community/sbcl-stage0/APKBUILD b/community/sbcl-stage0/APKBUILD
index 312baeb9c08d..2246960e1640 100644
--- a/community/sbcl-stage0/APKBUILD
+++ b/community/sbcl-stage0/APKBUILD
@@ -4,7 +4,7 @@
# Maintainer: Celeste <cielesti@protonmail.com>
maintainer="Celeste <cielesti@protonmail.com>"
pkgname=sbcl-stage0
-pkgver=2.5.0
+pkgver=2.5.1
pkgrel=0
pkgdesc="Steel Bank Common Lisp (for bootstrapping)"
url="https://www.sbcl.org/"
@@ -12,7 +12,7 @@ arch="all !ppc64le !s390x !riscv64 !loongarch64"
license="custom"
makedepends="linux-headers"
source="sbcl-$pkgver.tar.bz2::https://prdownloads.sourceforge.net/sbcl/sbcl-$pkgver-source.tar.bz2
- xperfecthash30-missing-entries-x86.patch
+ musl-time64.patch
"
builddir="$srcdir/sbcl-$pkgver"
options="!check" # stage0 compiler
@@ -57,6 +57,6 @@ package() {
}
sha512sums="
-78aa874fc52cbde3f47ce07b2d847d9cd665df5ac5a3bb4682e5afca696bdb223347184aacd27e0b927ebcfb3bdbcd449c57444c906cf44d44a4d6dfa19fc12a sbcl-2.5.0.tar.bz2
-3a2ef4d3f3129372d15a575ede7e1691964890fe27709dd89724f962263f1438880bce0753582b97779d3744dd7856174abe4732f2ffb89204f96a5ab3871592 xperfecthash30-missing-entries-x86.patch
+e316bda351299e1a797eff1e11f90dc542c03e402b000f5ba10797ff6384b8e936c2d8fb0bdf411b45f6c2ef2dd6c4727b9eed8f18fc2f61bb4eea562421c15e sbcl-2.5.1.tar.bz2
+c5b23ac36478943370156e8a499393c6923a069d8a38e4bf3b651ea91521353398cd813ef18dbcf9e76e97a24bfd85fb1d9cfb8da90951345a6f7ab0d28d65fc musl-time64.patch
"
diff --git a/community/sbcl-stage0/musl-time64.patch b/community/sbcl-stage0/musl-time64.patch
new file mode 100644
index 000000000000..974bc3de7026
--- /dev/null
+++ b/community/sbcl-stage0/musl-time64.patch
@@ -0,0 +1,20 @@
+https://musl.libc.org/time64.html
+
+64-bit everywhere, doesn't need special handling for 32-bit archs.
+
+--- a/tools-for-build/grovel-features.sh
++++ b/tools-for-build/grovel-features.sh
+@@ -52,13 +52,6 @@
+
+ featurep os-provides-posix-spawn
+
+-if [ "$sbcl_os" = linux ] ; then
+- case "$sbcl_arch" in
+- arm | x86 | ppc | mips | sparc | riscv32)
+- featurep 64-bit-time
+- esac
+-fi
+-
+ if [ "$sbcl_arch" = arm ] ; then
+ featurep arm-softfp
+ fi
diff --git a/community/sbcl-stage0/xperfecthash30-missing-entries-x86.patch b/community/sbcl-stage0/xperfecthash30-missing-entries-x86.patch
deleted file mode 100644
index 19f651cb6be0..000000000000
--- a/community/sbcl-stage0/xperfecthash30-missing-entries-x86.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Patch-Source: https://github.com/openbsd/ports/commit/ce79cfbe6f38d995b56753d46f6883a68e054eaa
-
---- a/xperfecthash30.lisp-expr.orig
-+++ b/xperfecthash30.lisp-expr
-@@ -1646,5 +1646,8 @@
- (#(1CA2F2FA 1DA2F48D 1EA2F620 1FA2F7B3)
- "#(:FCC0 :FCC1 :FCC2 :FCC3)"
- "( (& val 3) )")
-+(#(1DE9D83 2D83FFB FA6ADD3 15CC0915 1D30DC7C 1EFAF033)
-+ "(:ALLOW-OTHER-KEYS :FUNCTIONAL :SAME-BLOCK-P :INLINEP :INLINE-EXPANSION :KIND)"
-+ "( (& (+ (>> val 23) (>> val 26)) 7))")
- )
- ;; EOF
--
GitLab