<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/efd7f62f040903701c177b2cdfe09a0f32564f0b">https://github.com/macports/macports-ports/commit/efd7f62f040903701c177b2cdfe09a0f32564f0b</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new efd7f62f040 sbcl: fix build on 10.6 i386; update to 2.2.5
</span>efd7f62f040 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit efd7f62f040903701c177b2cdfe09a0f32564f0b
</span>Author: Kirill A. Korinsky <kirill@korins.ky>
AuthorDate: Sun Jun 4 22:35:01 2023 +0200
<span style='display:block; white-space:pre;color:#404040;'> sbcl: fix build on 10.6 i386; update to 2.2.5
</span>---
lang/sbcl/Portfile | 79 +++++++++++++---------
...tch-i386-contrib-sb-posix-posix-tests.lisp.diff | 20 ++++++
...-i386-mask-out-O_LARGEFILE-in-fcntl-1-test.diff | 18 +++++
lang/sbcl/files/patch-i386-missed-context.diff | 2 +-
.../files/patch-i386-revert-OS_THREAD_STACK.diff | 17 +++++
5 files changed, 102 insertions(+), 34 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/sbcl/Portfile b/lang/sbcl/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d5f56cd065b..c782a3d1bb1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/sbcl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/sbcl/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,39 +41,49 @@ checksums rmd160 95a02d7a489137602ebba333b83bfc1d9eb794be \
</span> sha256 89c90720cf9d05dbcd90d690e381a2514c0f1807159e0d7222220c5a8c2d5186 \
size 7474392
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.major} < 10} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 1.3.9 is the last version of SBCL which can be build before 10.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 1.3.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- epoch 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 d0da4fd941890372f3558bafb18433497c67c0ee \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 af0f09d4379113dfd5aa255279cb3df9cb9cac0bcd65369cc43dd857ca51de6e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 5758174
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif {${build_arch} eq "ppc"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 2.2.2 is the last version of SBCL with ppc-Darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 2.2.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- epoch 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 4960ccd562302f3223e2db7d32b9ecc50cf76536 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 8790dbbe97711dce14bb823125ce5b185b0073cf2f3cbf37bdd1ad380e7950f6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 6716272
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-} elseif {${build_arch} eq "i386"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 2.2.4 is the last version of SBCL with i386-Darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 2.2.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- epoch 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 2df788b7b6ebe35bf37c3264aeb06aef4f3416c3 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 fcdd251cbc65f7f808ed0ad77246848d1be166aa69a17f7499600184b7a57202 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 7030086
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-i386-missed-context.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-i386-old-preprocessor.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+platform darwin {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 10} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 1.3.9 is the last version of SBCL which can be build before 10.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 1.3.9
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ epoch 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 d0da4fd941890372f3558bafb18433497c67c0ee \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 af0f09d4379113dfd5aa255279cb3df9cb9cac0bcd65369cc43dd857ca51de6e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 5758174
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${configure.build_arch} eq "ppc"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 2.2.2 is the last version of SBCL with ppc-Darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 2.2.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ epoch 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 4960ccd562302f3223e2db7d32b9ecc50cf76536 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8790dbbe97711dce14bb823125ce5b185b0073cf2f3cbf37bdd1ad380e7950f6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6716272
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ universal_variant no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } elseif {${configure.build_arch} eq "i386"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # 2.2.5 is the last version of SBCL support of with i386-Darwin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 2.2.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ epoch 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 55225af6c20d39db1b158b7c07685ff6e3a8d5bf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8584b541370fd6ad6e58d3f97982077dfcab240f30d4e9b18f15da91c2f13ed1 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 7029912
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-i386-mask-out-O_LARGEFILE-in-fcntl-1-test.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-i386-revert-OS_THREAD_STACK.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-i386-old-preprocessor.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-i386-contrib-sb-posix-posix-tests.lisp.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-i386-missed-context.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ universal_variant no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
platform darwin powerpc {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -175,8 +185,11 @@ variant threads description {Enable multi-threaded runtime using the Mach pthrea
</span>
variant fancy conflicts threads description {Configure SBCL compilation with all available compatible options (including threading).} {
build.args-append --fancy
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Before 2.2.6 it ueses lz to compress core
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:zlib
</span> # As of version 2.2.6, zstd is used for core compression.
if {[vercmp ${version} 2.2.6] >= 0} {
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-delete port:zlib
</span> depends_lib-append port:zstd
patchfiles-append patch-config-darwin-${build_arch}.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/sbcl/files/patch-i386-contrib-sb-posix-posix-tests.lisp.diff b/lang/sbcl/files/patch-i386-contrib-sb-posix-posix-tests.lisp.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..76ab6e1455f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/sbcl/files/patch-i386-contrib-sb-posix-posix-tests.lisp.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git contrib/sb-posix/posix-tests.lisp contrib/sb-posix/posix-tests.lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 7c94a430d..b32a41893 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- contrib/sb-posix/posix-tests.lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ contrib/sb-posix/posix-tests.lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -341,6 +341,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (,mode (sb-posix::stat-mode ,stat)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ,@body)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#-(and darwin x86)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (deftest stat-mode.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (with-stat-mode (mode *test-directory*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (sb-posix:s-isreg mode))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -357,6 +358,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (sb-posix:s-ischr mode))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nil)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#-(and darwin x86)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (deftest stat-mode.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (with-stat-mode (mode *test-directory*)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (sb-posix:s-isblk mode))
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/sbcl/files/patch-i386-mask-out-O_LARGEFILE-in-fcntl-1-test.diff b/lang/sbcl/files/patch-i386-mask-out-O_LARGEFILE-in-fcntl-1-test.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..ab1300485be
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/sbcl/files/patch-i386-mask-out-O_LARGEFILE-in-fcntl-1-test.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+See:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - https://github.com/sbcl/sbcl/commit/bebec0fb89ceefde0f1d584da439989bc12ad17d
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - https://github.com/sbcl/sbcl/commit/cc425f4be3125c3ba48418cc76bc1d3d3260a431
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - https://github.com/sbcl/sbcl/commit/306beeae30de474fb46c3efd31e8e2ea5acb65fb
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git contrib/sb-posix/posix-tests.lisp contrib/sb-posix/posix-tests.lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index a75d91646..962fbb452 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- contrib/sb-posix/posix-tests.lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ contrib/sb-posix/posix-tests.lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -434,7 +434,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;; O_LARGEFILE is always set on 64-bit *nix platforms even though the whole
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;; flag makes no sense.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#-win32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#-(or (and darwin x86) win32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (deftest fcntl.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (let ((fd (sb-posix:open "/dev/null" sb-posix::o-nonblock)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (logtest (sb-posix:fcntl fd sb-posix::f-getfl)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/sbcl/files/patch-i386-missed-context.diff b/lang/sbcl/files/patch-i386-missed-context.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index b2b16bb4cf0..a690ea19a37 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/lang/sbcl/files/patch-i386-missed-context.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/sbcl/files/patch-i386-missed-context.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-See: https://github.com/sbcl/sbcl/blob/sbcl-1.3.9/src/runtime/x86-bsd-os.c#L113-L128
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+See: https://github.com/sbcl/sbcl/commit/3bf3c33f9e291f2edbdfe8ba7c57128586923e41
</span>
diff --git src/runtime/x86-darwin-os.h src/runtime/x86-darwin-os.h
index 7ff303b96..cf6487815 100644
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/sbcl/files/patch-i386-revert-OS_THREAD_STACK.diff b/lang/sbcl/files/patch-i386-revert-OS_THREAD_STACK.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..c271597e9f3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/lang/sbcl/files/patch-i386-revert-OS_THREAD_STACK.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+See:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - https://github.com/sbcl/sbcl/commit/e3490371ab2207d5280084df0c76aee1a14879c2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ - https://github.com/sbcl/sbcl/commit/c7590d3d7e73a4da203b71493a9cb353d8280f1c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/cold/shared.lisp src/cold/shared.lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c0b32fc6c..4e0f92b56 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/cold/shared.lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/cold/shared.lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -285,7 +285,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (push :compact-symbol sb-xc:*features*))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (when (target-featurep '(:and :sb-thread (:not :win32)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (push :pauseless-threadstart sb-xc:*features*))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (when (target-featurep '(:and :sb-thread (:or :darwin :openbsd)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (when (target-featurep '(:and :sb-thread (:or (:and :darwin (:not :x86)) :openbsd)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (push :os-thread-stack sb-xc:*features*))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (when (target-featurep '(:and :x86 :int4-breakpoints))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;; 0xCE is a perfectly good 32-bit instruction,
</span></pre><pre style='margin:0'>
</pre>