lang/sbcl: Update to 2.2.9

This commit is contained in:
Kirill Ponomarev 2022-10-05 08:44:30 +02:00
parent ffb7e6256b
commit a7bdad22b9
5 changed files with 6 additions and 63 deletions

View File

@ -3,9 +3,8 @@
# pinned to exact versions of everything used to build them.
PORTNAME= sbcl
DISTVERSION= 2.2.7
DISTVERSION= 2.2.9
DISTVERSIONSUFFIX= -source
PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= lang lisp
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION} \

View File

@ -1,8 +1,8 @@
TIMESTAMP = 1659246860
SHA256 (sbcl-2.2.7-source.tar.bz2) = ec98996fdaa68009d98b4d7db2189271f2ad455ec322ca95a9c6aebf08bead6d
SIZE (sbcl-2.2.7-source.tar.bz2) = 7269832
SHA256 (sbcl-2.2.7-documentation-html.tar.bz2) = 58fd03df30d7db5b56482a7e0394d120a9985415aed7d1c3a3d5702e9317fae6
SIZE (sbcl-2.2.7-documentation-html.tar.bz2) = 236509
TIMESTAMP = 1664951415
SHA256 (sbcl-2.2.9-source.tar.bz2) = 7ebebd6d2023fff7077b0372fa1171f880529bdec6104f20983297c2feb7c172
SIZE (sbcl-2.2.9-source.tar.bz2) = 7258148
SHA256 (sbcl-2.2.9-documentation-html.tar.bz2) = ca05937ae29dd69cae25f62da86bf3e71db81be1a22c809b3000b92cd8fe85c8
SIZE (sbcl-2.2.9-documentation-html.tar.bz2) = 232759
SHA256 (sbcl-1.2.7-x86-64-freebsd-binary.tar.bz2) = c61f5e777e56921d2452d0fa6b71024ccd9b99bc659676498d398b8663176492
SIZE (sbcl-1.2.7-x86-64-freebsd-binary.tar.bz2) = 10463348
SHA256 (sbcl-1.2.7-x86-freebsd-binary.tar.bz2) = cf68bfab780a14964d9593f5b47fa3e174cf43e95ae3e558712d218f1c37bdbe

View File

@ -1,20 +0,0 @@
From 9de74a0d4d0f1f38db5ae7e891480d8a4b4ad8d9 Mon Sep 17 00:00:00 2001
From: Douglas Katzman <dougk@google.com>
Date: Tue, 2 Aug 2022 14:40:28 -0400
Subject: [PATCH] Add /usr/local/include for freebsd
https://wiki.freebsd.org/WarnerLosh/UsrLocal says something about it.
Should fix lp#1981112.
--- src/runtime/Config.x86-64-freebsd.orig 2022-07-29 14:39:18 UTC
+++ src/runtime/Config.x86-64-freebsd
@@ -15,7 +15,8 @@ include Config.x86-64-bsd
# worked fine for most things, but LOAD-FOREIGN & friends require
# dlopen() etc., which in turn depend on dynamic linking of the
# runtime.
-OS_LIBS += -lutil
+OS_LIBS += -lutil -L/usr/local/lib
+CPPFLAGS += -isystem/usr/local/include
# use libthr (1:1 threading). libpthread (m:n threading) does not work.
ifdef LISP_FEATURE_SB_THREAD

View File

@ -1,16 +0,0 @@
From 48d686f9718f98122547a9006c871cfcd50439ab Mon Sep 17 00:00:00 2001
From: Douglas Katzman <dougk@google.com>
Date: Sun, 31 Jul 2022 21:38:19 -0400
Subject: [PATCH] Accept that value-cell-value can move to R/O space
Fixes lp#1983218
--- src/runtime/stringspace.c.orig 2022-07-29 14:39:18 UTC
+++ src/runtime/stringspace.c
@@ -76,6 +76,7 @@ static void visit_pointer_words(lispobj* object, lispo
widetag == RATIO_WIDETAG || widetag == COMPLEX_WIDETAG ||
widetag == SIMPLE_ARRAY_WIDETAG ||
(widetag >= COMPLEX_BASE_STRING_WIDETAG && widetag <= COMPLEX_ARRAY_WIDETAG) ||
+ widetag == VALUE_CELL_WIDETAG ||
widetag == WEAK_POINTER_WIDETAG) {
int len = object_size(object), i;
for (i=1; i<len; ++i) FIX(object[i]);

View File

@ -1,20 +0,0 @@
From 48d686f9718f98122547a9006c871cfcd50439ab Mon Sep 17 00:00:00 2001
From: Douglas Katzman <dougk@google.com>
Date: Sun, 31 Jul 2022 21:38:19 -0400
Subject: [PATCH] Accept that value-cell-value can move to R/O space
Fixes lp#1983218
--- tests/save1.test.sh.orig 2022-07-29 14:39:18 UTC
+++ tests/save1.test.sh
@@ -23,6 +23,11 @@ run_sbcl <<EOF
;; but maybe someone changed it :immobile, so bind it to be certain.
(let (#+immobile-code (sb-c::*compile-to-memory-space* :dynamic))
(defvar *afun* (compile nil '(lambda (x) (- (length x))))))
+ ;; test for lp#1983218 - a VALUE-CELL holding a readonly string could crash
+ (defun mkcell (x) (sb-sys:%primitive sb-vm::make-value-cell x nil))
+ (compile 'mkcell)
+ (defvar *cell* (mkcell (symbol-name '*print-base*)))
+ ;;
(save-lisp-and-die "$tmpcore")
EOF
run_sbcl_with_core "$tmpcore" --noinform --no-userinit --no-sysinit --noprint \