From nobody Wed Dec 11 12:18:17 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y7ZPk15qYz5grcj; Wed, 11 Dec 2024 12:18:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y7ZPk0NTYz50xH; Wed, 11 Dec 2024 12:18:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733919498; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=whnNHK3uEmcPvJEm/FFpMRs9rxvZrLrlv3VKqSUaGgA=; b=lqVw30IGVtUyeqWtjXHnSsClWP6Jc0G3xgysc1niP+i6uIapKlCyHhF544W+CACF2rU6N1 gUTBrgTIg7BvHzGhOkBPdYP29gFTIp1YPIytLsvM0xF0Ng28fh8Eijv2RcjlvMRo2ITEGK a2b/dSV0A2I+i4C0PguvhuqtZgZh5wDwr4D9JohiTPOehEmGn1HwVBsxmGl+8tTXE6HYDe ZMADbD69YGOAYTIkxPm/XksaXELm/05KlH68UozmJ0RI5rFHhbgEbty6AR0gUfWH8eoOIn bF0IvezdUqpQjViOKUNQFyFNr8rmgL5cwIA/6b2IUTO/HPDWlBOrvbtc/CIuPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733919498; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=whnNHK3uEmcPvJEm/FFpMRs9rxvZrLrlv3VKqSUaGgA=; b=EDl38vooKjcHozpeSFn++Gm2jgWR8TQ3+PNu2tJFJxOpTPCaUpsuCbjRLTaaQygAkQCqgR r2aLvy243hG13XGWfvDKTmze+szrjKchY3F+ToGuGfLlJPZ/gq+//Dujlk+qTTS1vLXDQR NNmCNyzEtwtOYaAowzKA00V/F8VGuOZNa1FPUGcbwbqwY9DsIXOuKf1pYnr1LfIzQrMT95 yTvADB3Yot7OjKvlkmX7WdvkDXHefuCaSSjSC6PXp2GUvqJLzFrxn7rmztIViijSCPfJVJ zaDO6BLryAlr2TsebIPEakf6JD5BffxVcyS5+bI3uBquHH/EsPxe6lEgUsNPtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733919498; a=rsa-sha256; cv=none; b=R99m7lB1h7vBiAh/6VEZHCQOW1wBQkkHFsiNgxLe0s8QPdksl85EENnouaT7ziKxRdwNNZ J0lRs0qtEWIbObTzZwRz1+Tk1MANR2nlEmqjGfHAblVgWuoyLf6v35thIkEFngppyV0rp9 9LmwdSrFclRfyNOK4XIwoMxfUFzh/CP/x1YsOZfqBIkQxkGPSnNPV4ccGHXpLnr6E7h/vr bIBdHfbXqfhqvtJrb81bm5pZk4GCkSbXzLukBIsR06upyf3jW1J+rpKMCDJhyw4vKT5C+m ap2tF8gXxmpGHvW9acKFiFRTNNjoI8+VO+QGTHQ1ho9z1e8dnzRqvR2cJZD+Ow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y7ZPk001vz176J; Wed, 11 Dec 2024 12:18:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BBCIHNM035498; Wed, 11 Dec 2024 12:18:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BBCIHIJ035495; Wed, 11 Dec 2024 12:18:17 GMT (envelope-from git) Date: Wed, 11 Dec 2024 12:18:17 GMT Message-Id: <202412111218.4BBCIHIJ035495@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Joseph Mingrone Subject: git: 0710b9ab10ea - main - lang/sbcl: Backport fix for SBCL bug #2090967 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0710b9ab10eadde4b89478195f3ec68f53ff7796 Auto-Submitted: auto-generated The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/ports/commit/?id=0710b9ab10eadde4b89478195f3ec68f53ff7796 commit 0710b9ab10eadde4b89478195f3ec68f53ff7796 Author: Joseph Mingrone AuthorDate: 2024-12-08 21:36:54 +0000 Commit: Joseph Mingrone 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)