sbcl: update to 2.0.10.
Use ecl for bootstrapping on musl, bootstrapping with ccl is broken. Revert this later, ccl is much faster.
This commit is contained in:
parent
e3d927ec19
commit
6b5fe12f35
3 changed files with 6 additions and 58 deletions
|
@ -1,25 +0,0 @@
|
|||
From d0243a9f9961f0afdc09b555821b88edb2488be9 Mon Sep 17 00:00:00 2001
|
||||
From: Stas Boukarev <stassats@gmail.com>
|
||||
Date: Wed, 30 Sep 2020 02:46:31 +0300
|
||||
Subject: [PATCH] Fix CPUID checking.
|
||||
|
||||
cpu-has- is an index, not a mask. Have popcnt and no avx => bad time.
|
||||
---
|
||||
src/compiler/x86-64/parms.lisp | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/compiler/x86-64/parms.lisp b/src/compiler/x86-64/parms.lisp
|
||||
index 5aeddff47c..a9d2bef01e 100644
|
||||
--- src/compiler/x86-64/parms.lisp
|
||||
+++ src/compiler/x86-64/parms.lisp
|
||||
@@ -178,8 +178,8 @@
|
||||
(defvar *binding-stack-pointer*)
|
||||
|
||||
;;; Bit indices into *CPU-FEATURE-BITS*
|
||||
-(defconstant cpu-has-ymm-registers 1)
|
||||
-(defconstant cpu-has-popcnt 2)
|
||||
+(defconstant cpu-has-ymm-registers 0)
|
||||
+(defconstant cpu-has-popcnt 1)
|
||||
|
||||
(defconstant-eqx +static-symbols+
|
||||
`#(,@+common-static-symbols+
|
|
@ -1,27 +0,0 @@
|
|||
#2020/01/30 Patch has not yet been accepted upstream
|
||||
From 5d7395cbd4eb952d4a988c4ee7ee3f5111a9f5a7 Mon Sep 17 00:00:00 2001
|
||||
From: Eric Timmons <etimmons@mit.edu>
|
||||
Date: Sat, 1 Feb 2020 17:34:10 -0500
|
||||
Subject: [PATCH 4/5] Only include old memcpy version on glibc
|
||||
|
||||
---
|
||||
src/runtime/memcpy.h | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/runtime/memcpy.h b/src/runtime/memcpy.h
|
||||
index a99c5fb7e..e3d104e3a 100644
|
||||
--- src/runtime/memcpy.h
|
||||
+++ src/runtime/memcpy.h
|
||||
@@ -1,3 +1,4 @@
|
||||
+#ifdef __GLIBC__
|
||||
#ifdef __linux__
|
||||
#ifdef __amd64__
|
||||
#ifdef __ASSEMBLER__
|
||||
@@ -14,3 +15,4 @@ __asm__(".symver memcpy,memcpy@GLIBC_2.0");
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
+#endif
|
||||
--
|
||||
2.25.0
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'sbcl'
|
||||
pkgname=sbcl
|
||||
version=2.0.9
|
||||
revision=3
|
||||
version=2.0.10
|
||||
revision=1
|
||||
archs="i686 x86_64* armv7l aarch64"
|
||||
hostmakedepends="iana-etc"
|
||||
makedepends="zlib-devel"
|
||||
|
@ -12,7 +12,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=c4f700350c113fe003ee93a9922146209d6fa50b63c6accc4abf90fb38cb9b9f
|
||||
checksum=51754110b6c54dcd3857a213d6113628a89b4d43348cfd38c1fac373927a0557
|
||||
nocross=yes
|
||||
nopie=yes
|
||||
|
||||
|
@ -20,7 +20,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+=" cd2d1e4be63ef6d91c2849fd3c8b94a7ab5340b87cdd5193104a00201575dd9e"
|
||||
checksum+=" 5ac9304ea5fe49be44b87afbe02d73dc5a66cdd412759ee6ce8e8a8b5b214b87"
|
||||
;;
|
||||
i686)
|
||||
distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.4.3-x86-linux-binary.tar.bz2"
|
||||
|
@ -35,8 +35,8 @@ aarch64)
|
|||
checksum+=" 494829f8e3ea7eb1c308b343cc390daf94a6215030a5f2b9ee0cded67511e918"
|
||||
;;
|
||||
*-musl)
|
||||
makedepends+=" ccl"
|
||||
_bootstrap_lisp="ccl --batch --quiet --no-init"
|
||||
makedepends+=" ecl"
|
||||
_bootstrap_lisp="ecl"
|
||||
;;
|
||||
esac
|
||||
|
||||
|
|
Loading…
Reference in a new issue