From nobody Sat Aug 6 07:14:07 2022 X-Original-To: dev-commits-ports-main@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 4M0DGl74nBz4YBjc; Sat, 6 Aug 2022 07:14:07 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4M0DGl6ZQzz3s0l; Sat, 6 Aug 2022 07:14:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659770047; 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=DdDjRCuG5P+fQkX2fN1ou0Zg9xGrHzjfGvT/3ZE2Y9U=; b=cFph1vGprG+vGigLp3sBTsH4ZhoDfvQXxz/HWU4lsh5zvoPQBzGC9uh3gtWqg0l9Bagu4v Q1w7amdjCCe86t9SBnOJr0l1m3LkRPCku/9UHVeVpxUIzvstXb9TQcSIujB1PVyfj09Mny UGQqCX1Zrr5o+cDO/TN4zpWOTvxY1yXeYd2GweaJkWI3skMGulGxRu0I6bEcaSCM6SFLRy HKLjbhLDCMSx38FnWGA1SUcPQ12h/k+QtC5lrGai4/5SX3fhauzayrzQ8cSOMs2XCmUOEj aiS9dalC1+c4SBwEaZLpwryezhHOiFI1+lPVHMiRoGAf4o6i4s1Z2H/lTeHgsg== 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 4M0DGl5dNMzPgj; Sat, 6 Aug 2022 07:14:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2767E7kf025435; Sat, 6 Aug 2022 07:14:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2767E7MY025434; Sat, 6 Aug 2022 07:14:07 GMT (envelope-from git) Date: Sat, 6 Aug 2022 07:14:07 GMT Message-Id: <202208060714.2767E7MY025434@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kirill Ponomarev Subject: git: 5b9ecf3b2bf6 - main - lang/sbcl: Fix a regression in sbcl 2.2.7 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: krion X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5b9ecf3b2bf6d15cedad7a96a04fe335c73a58cb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659770047; 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=DdDjRCuG5P+fQkX2fN1ou0Zg9xGrHzjfGvT/3ZE2Y9U=; b=I8OQOSRI0kLi3bxfNA5w3T7ksMnzPhdICB82Vuf/x25XEPWlgGGqr0syY6bOZXUfPkb4jo 1eIH10loWq5Xm+PNKQJ0lX65DuKh/05Yk8af+DLFTnCsa+hMnj7cNRICqg42ihdOgWtPey kybvol9frk5d/U4WvQjFOnMsBpCDNTiX7e7qTF5vkVjRUdyFt1DzFdfg9AZjdAnDkNTt40 0q4xqeLFvzR6RglixvsL5X+UwE0ZxGiJ2+MkKBGAm9Ia9qqkWHe5Hujhhb10blZ8/UWlfj VOkFsPL7a0Ps8hc02cy+9GBzM9pLOaLCsEaEo4rdrrIoGXQDBcWFcYBAf/HRcQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659770047; a=rsa-sha256; cv=none; b=iFEyDaTOjyuzOXcC0bffwwURDyeC3cleKioB44ajm8InhRsbXOnZ2JvMNSpDzdW3Un0UHP Xqq0YG99ulFLxj9kh8pgBZHhX03xy0slikXLqri6Lwii3UHFnAKScUE7tOluOsJMMQyp8W 14H3wf1C5g0OO0y0TKdl0Wk+FN8t34lioX66xcIlyPkHN7cLsYkG+Yh0Eh7GVXE87zO2/A Otb0X6q4zGpogbrOXMQotXy3baVfMQhiaVUPj4IpWG9TK9ry+1ZYd7ABlL8bWRvPSU8DtE 3pE1Z+zOQywuHuJc1Z/72hSnJ3lyLuR9sHNqYr9BoiPxD27AONkzC8NT98ArBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by krion: URL: https://cgit.FreeBSD.org/ports/commit/?id=5b9ecf3b2bf6d15cedad7a96a04fe335c73a58cb commit 5b9ecf3b2bf6d15cedad7a96a04fe335c73a58cb Author: Kirill Ponomarev AuthorDate: 2022-08-06 07:12:45 +0000 Commit: Kirill Ponomarev CommitDate: 2022-08-06 07:12:45 +0000 lang/sbcl: Fix a regression in sbcl 2.2.7 PR: 265661 Reported by: dmgk, jinxiaoyong@gmail.com --- lang/sbcl/Makefile | 4 ++-- .../files/patch-src_runtime_Config.x86-64-freebsd | 20 ++++++++++++++++++++ lang/sbcl/files/patch-src_runtime_stringspace.c | 16 ++++++++++++++++ lang/sbcl/files/patch-tests_save1.test.sh | 20 ++++++++++++++++++++ 4 files changed, 58 insertions(+), 2 deletions(-) diff --git a/lang/sbcl/Makefile b/lang/sbcl/Makefile index da80ec8b76a2..34052fefc3cd 100644 --- a/lang/sbcl/Makefile +++ b/lang/sbcl/Makefile @@ -5,7 +5,7 @@ PORTNAME= sbcl DISTVERSION= 2.2.7 DISTVERSIONSUFFIX= -source -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= lang lisp MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${DISTVERSION} \ @@ -143,7 +143,7 @@ post-patch: ${WRKSRC}/doc/manual/start-stop.texinfo do-build: - (cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} LINKFLAGS="${LDFLAGS}" ${SH} make.sh ${MAKE_SH_ARGS}) + (cd ${WRKSRC} && ${SH} make.sh ${MAKE_SH_ARGS}) post-build-DOCS-on: ${DO_MAKE_BUILD} -C ${WRKSRC}/doc/manual info html diff --git a/lang/sbcl/files/patch-src_runtime_Config.x86-64-freebsd b/lang/sbcl/files/patch-src_runtime_Config.x86-64-freebsd new file mode 100644 index 000000000000..43b2a9d39cec --- /dev/null +++ b/lang/sbcl/files/patch-src_runtime_Config.x86-64-freebsd @@ -0,0 +1,20 @@ +From 9de74a0d4d0f1f38db5ae7e891480d8a4b4ad8d9 Mon Sep 17 00:00:00 2001 +From: Douglas Katzman +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 diff --git a/lang/sbcl/files/patch-src_runtime_stringspace.c b/lang/sbcl/files/patch-src_runtime_stringspace.c new file mode 100644 index 000000000000..f4c0fd029b64 --- /dev/null +++ b/lang/sbcl/files/patch-src_runtime_stringspace.c @@ -0,0 +1,16 @@ +From 48d686f9718f98122547a9006c871cfcd50439ab Mon Sep 17 00:00:00 2001 +From: Douglas Katzman +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 +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 <