From 01e332477ea90b99ef305b06613e98871b7d7b4f Mon Sep 17 00:00:00 2001 From: Leah Neukirchen Date: Fri, 7 Feb 2025 19:39:18 +0100 Subject: [PATCH] sbcl: update to 2.5.1. --- srcpkgs/sbcl/patches/perfecthash.patch | 48 -------------------------- srcpkgs/sbcl/template | 6 ++-- 2 files changed, 3 insertions(+), 51 deletions(-) delete mode 100644 srcpkgs/sbcl/patches/perfecthash.patch diff --git a/srcpkgs/sbcl/patches/perfecthash.patch b/srcpkgs/sbcl/patches/perfecthash.patch deleted file mode 100644 index f53e8eff6f2..00000000000 --- a/srcpkgs/sbcl/patches/perfecthash.patch +++ /dev/null @@ -1,48 +0,0 @@ -Necessary for CLISP bootstrap. -Provided by stassats`. - ---- a/sbcl/xperfecthash30.lisp-expr -+++ b/sbcl/xperfecthash30.lisp-expr -@@ -692,6 +692,9 @@ - (let ((b (& (>> val 10) #x7))) - (let ((a (>> (<< val 5) 29))) - (^ a (aref tab b))))))") -+(#(1DE9D83 2D83FFB FA6ADD3 15CC0915 1D30DC7C 1EFAF033) -+ "(:ALLOW-OTHER-KEYS :FUNCTIONAL :SAME-BLOCK-P :INLINEP :INLINE-EXPANSION :KIND)" -+ "( (& (+ (>> val 23) (>> val 26)) 7))") - (#(1E847AD A771EC5 E70844A 1A23C247 1AAF3CC2 1C5EFFF8) - "(SB-C::PROPER-OR-DOTTED-LIST SB-C::PROPER-OR-CIRCULAR-LIST SB-C::PROPER-SEQUENCE SB-C::PROPER-LIST TYPE-SPECIFIER SB-C::MODIFYING)" - "( (& (^ (>> val 1) (>> val 13)) 7))") ---- a/sbcl/xperfecthash61.lisp-expr -+++ b/sbcl/xperfecthash61.lisp-expr -@@ -773,6 +773,9 @@ - (#(15416355 42D83FFB 4341F7D8 63C971D7 8F7912D6) - "(:ALLOW-OTHER-KEYS :HOOK :FIRED :LEXENV :SOURCE-PATH)" - "( (& (- val (>> val 4)) 7))") -+(#(15CC0915 42D83FFB 6FA6ADD3 7D30DC7C 81DE9D83 FEFAF033) -+ "(:ALLOW-OTHER-KEYS :FUNCTIONAL :SAME-BLOCK-P :INLINEP :INLINE-EXPANSION :KIND)" -+ "( (& (+ (>> val 7) (>> val 30)) 7))") - (#(1607B33C 380E1F3F 75FB05B6 87C835DD 9DD07497 A4EDA9A1 E0AD3E74 F7158E95 FD00B976) - "(SB-VM::COMPLEX-SINGLE-REG SB-VM::COMPLEX-DOUBLE-REG SB-VM::DOUBLE-REG SB-VM::SINGLE-REG SB-VM::DESCRIPTOR-REG SB-VM::SAP-REG SB-VM::SIGNED-REG SB-VM::UNSIGNED-REG SB-VM::ANY-REG)" - "((let ((tab #a((8) (unsigned-byte 8) 12 0 0 5 5 0 0 0))) ---- a/sbcl/xperfecthash63.lisp-expr -+++ b/sbcl/xperfecthash63.lisp-expr -@@ -1138,6 +1138,9 @@ - (#(15416355 42D83FFB 4341F7D8 63C971D7 8F7912D6) - "(:ALLOW-OTHER-KEYS :HOOK :FIRED :LEXENV :SOURCE-PATH)" - "( (& (- val (>> val 4)) 7))") -+(#(15CC0915 42D83FFB 6FA6ADD3 7D30DC7C 81DE9D83 FEFAF033) -+ "(:ALLOW-OTHER-KEYS :FUNCTIONAL :SAME-BLOCK-P :INLINEP :INLINE-EXPANSION :KIND)" -+ "( (& (+ (>> val 7) (>> val 30)) 7))") - (#(1607B33C 380E1F3F 75FB05B6 87C835DD 9DD07497 A4EDA9A1 E0AD3E74 F7158E95 FD00B976) - "(SB-VM::COMPLEX-SINGLE-REG SB-VM::COMPLEX-DOUBLE-REG SB-VM::DOUBLE-REG SB-VM::SINGLE-REG SB-VM::DESCRIPTOR-REG SB-VM::SAP-REG SB-VM::SIGNED-REG SB-VM::UNSIGNED-REG SB-VM::ANY-REG)" - "((let ((tab #a((8) (unsigned-byte 8) 12 0 0 5 5 0 0 0))) -@@ -1988,8 +1991,5 @@ - (#(B02153B3 C49039A2 DB6D6FD7 E487643D F5B1443E) - "(SIMPLE-VECTOR VECTOR CONS LIST NIL)" - "( (& (+ (>> val 1) (>> val 4)) 7))") --(#(15CC0915 42D83FFB 6FA6ADD3 7D30DC7C 81DE9D83 FEFAF033) -- "(:ALLOW-OTHER-KEYS :FUNCTIONAL :SAME-BLOCK-P :INLINEP :INLINE-EXPANSION :KIND)" -- "( (& (+ (>> val 7) (>> val 30)) 7))") - ) - ;; EOF diff --git a/srcpkgs/sbcl/template b/srcpkgs/sbcl/template index 32c9da3002f..9048fedd2b6 100644 --- a/srcpkgs/sbcl/template +++ b/srcpkgs/sbcl/template @@ -1,6 +1,6 @@ # Template file for 'sbcl' pkgname=sbcl -version=2.5.0 +version=2.5.1 revision=1 # make sure the sbcl option in maxima is enabled for the same archs archs="i686 x86_64* armv7l aarch64 ppc64le*" @@ -16,7 +16,7 @@ license="custom:BSD+public_domain" homepage="http://www.sbcl.org/" changelog="http://www.sbcl.org/news.html" distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2" -checksum=2e18afd088e4a2df21b77bae2e170ce570d11da6d27607292265f1cc6a8a19b1 +checksum=4133b36cd16d14d633969c37fd51c2c89a8ea5d6e1611552819d91f71b219f8b nocross=yes nopie=yes @@ -24,7 +24,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d case "$XBPS_TARGET_MACHINE" in x86_64) distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2" - checksum+=" ac430fe7cf6b4a8d4dc8e0a2371265b6c6605dba06874a9c93521222292769a2" + checksum+=" e74e13c3bc088bbe408accd5a5863c143a0389f429f316218ea53081a41d513e" ;; arm*) distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.2.14-armhf-linux-binary.tar.bz2"