Date: Wed, 11 Dec 2024 12:18:17 GMT From: Joseph Mingrone <jrm@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 0710b9ab10ea - main - lang/sbcl: Backport fix for SBCL bug #2090967 Message-ID: <202412111218.4BBCIHIJ035495@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/ports/commit/?id=0710b9ab10eadde4b89478195f3ec68f53ff7796 commit 0710b9ab10eadde4b89478195f3ec68f53ff7796 Author: Joseph Mingrone <jrm@FreeBSD.org> AuthorDate: 2024-12-08 21:36:54 +0000 Commit: Joseph Mingrone <jrm@FreeBSD.org> CommitDate: 2024-12-11 12:12:05 +0000 lang/sbcl: Backport fix for SBCL bug #2090967 A change introduced in SBCL 2.4.11 caused build failures for downstream projects such as StumpWM. For details, see: https://bugs.launchpad.net/sbcl/+bug/2090967. Backport a fix from the SBCL master branch to address the build issue for x11-wm/stumpwm. Approved by: krion (maintainer, via IRC) Differential Revision: https://reviews.freebsd.org/D47995 --- lang/sbcl/Makefile | 1 + lang/sbcl/files/patch-src_compiler_ir1util.lisp | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/lang/sbcl/Makefile b/lang/sbcl/Makefile index 2a8f944a8151..abe8a7162251 100644 --- a/lang/sbcl/Makefile +++ b/lang/sbcl/Makefile @@ -5,6 +5,7 @@ PORTNAME= sbcl DISTVERSION= 2.4.11 DISTVERSIONSUFFIX= -source +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= lang lisp MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION} \ diff --git a/lang/sbcl/files/patch-src_compiler_ir1util.lisp b/lang/sbcl/files/patch-src_compiler_ir1util.lisp new file mode 100644 index 000000000000..dbaaf62bcccd --- /dev/null +++ b/lang/sbcl/files/patch-src_compiler_ir1util.lisp @@ -0,0 +1,12 @@ +--- src/compiler/ir1util.lisp.orig 2024-11-30 10:23:33 UTC ++++ src/compiler/ir1util.lisp +@@ -308,6 +308,9 @@ + (defun erase-lvar-type (lvar) + (when lvar + (setf (lvar-%derived-type lvar) nil) ++ (loop for annotation in (lvar-annotations lvar) ++ when (lvar-type-annotation-p annotation) ++ do (setf (lvar-annotation-fired annotation) t)) + (let ((dest (lvar-dest lvar))) + (cond ((cast-p dest) + (derive-node-type dest *wild-type* :from-scratch t)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202412111218.4BBCIHIJ035495>