<pre style='margin:0'>
Mark Evenson (easye) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/6ce8779bcde6fc4cf288a55e95e3dd145f9966c7">https://github.com/macports/macports-ports/commit/6ce8779bcde6fc4cf288a55e95e3dd145f9966c7</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 6ce8779 lang/sbcl: update to sbcl-1.5.4
</span>6ce8779 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 6ce8779bcde6fc4cf288a55e95e3dd145f9966c7
</span>Author: Mark Evenson <evenson.not.org@gmail.com>
AuthorDate: Thu Jul 11 22:25:32 2019 +0200
<span style='display:block; white-space:pre;color:#404040;'> lang/sbcl: update to sbcl-1.5.4
</span>---
lang/sbcl/Portfile | 11 +++---
lang/sbcl/files/patch-restore-build.diff | 65 ++++++++++++++++++++++++++++++++
math/maxima/Portfile | 2 +-
3 files changed, 72 insertions(+), 6 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 1cea7c6..119d6ac 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;'>@@ -8,7 +8,7 @@ name sbcl
</span> #
# Please bump the revision of math/maxima and math/maxima-devel when
# this port changes.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 1.5.2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 1.5.4
</span> revision 0
categories lang
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,15 +33,16 @@ use_bzip2 yes
</span>
patchfiles \
patch-contrib-sb-posix-posix-tests.lisp.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-use-right-gcc.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-use-right-gcc.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-restore-build.diff
</span>
distfiles ${name}-${version}-source${extract.suffix}:sbcl
worksrcdir ${name}-${version}
checksums ${name}-${version}-source${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 f60d8d0e590199b2a72e880fa96a285d2e7a3fa1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 dac6aef3ec7628c284a31f2222ede5d47d9d94f9cfdffe0f00ef40f9531e3c3f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 6343957
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 b8f3e63e6533e7edb45c0c5f95030be4650bef01 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ec872be63697041fbb1c6324382b736c2aecb2fc1edb9961f9bfe7b017c1f45c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6351370
</span>
# N.b. The version of i386 bootstrap port had to be updated to compile
# sbcl-1.4.9. there is no corresponding binary for macOS/PPC, so the
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/lang/sbcl/files/patch-restore-build.diff b/lang/sbcl/files/patch-restore-build.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..4f50866
</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-restore-build.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,65 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# HG changeset patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# User Douglas Katzman <dougk@google.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Date 1562783129 14400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Wed Jul 10 14:25:29 2019 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Node ID d27694577f5c30582b06081910220c56472a3ffe
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Parent 9761835a375cdafeee4f888854fd322aa76356bc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Restore building 64-bit target on 32-bit host
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Quite likely broken since rev 99d9560c4511
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From <https://sourceforge.net/p/sbcl/sbcl/ci/e183e0c5b963b6d761eec565eb505b1ce6672df0/>.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -r 9761835a375c -r d27694577f5c src/cold/set-up-cold-packages.lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/cold/set-up-cold-packages.lisp Tue Jul 09 22:14:15 2019 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/cold/set-up-cold-packages.lisp Wed Jul 10 14:25:29 2019 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -212,7 +212,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;; (* 50 (hash-table-rehash-threshold (make-hash-table)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;; because we are not intercepting '*.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (defparameter *dual-personality-math-symbols*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- '("+" "-" "*" "/" "=" "/=" "<" "<=" ">" ">=" "MIN" "MAX"))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ '("+" "-" "*" "/" "=" "/=" "<" "<=" ">" ">=" "MIN" "MAX"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;; We've gotten along quite well without an alter-ego for FIXNUM,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;; but now some s-expressions mentioning the type FIXNUM are fed
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;; to the host for evaluation, and a type-checking host (such as we are)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;; croaks if an argument exceeds the host's notion of fixnum.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ;; Get around it by changing those uses of fixnum to SB-XC:FIXNUM.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ "FIXNUM"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;; When playing such tricky package games, it's best to have the symbols that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;; are visible by default, i.e. XC-STRICT-CL:NAME, have no definition,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -r 9761835a375c -r d27694577f5c src/compiler/generic/early-vm.lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/compiler/generic/early-vm.lisp Tue Jul 09 22:14:15 2019 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/compiler/generic/early-vm.lisp Wed Jul 10 14:25:29 2019 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -166,3 +166,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;; The offset from the fault address reported to the runtime to the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ;;; END of the global safepoint page.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (defconstant gc-safepoint-trap-offset n-word-bytes)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#+sb-xc-host (deftype sb-xc:fixnum () `(signed-byte ,n-fixnum-bits))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -r 9761835a375c -r d27694577f5c src/compiler/sxhash.lisp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/compiler/sxhash.lisp Tue Jul 09 22:14:15 2019 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/compiler/sxhash.lisp Wed Jul 10 14:25:29 2019 -0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -100,10 +100,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (defglobal +sxhash-single-float-expr+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ `(let ((bits (logand (single-float-bits x) ,(1- (ash 1 32)))))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (logxor 66194023
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (sxhash (the fixnum
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (sxhash (the sb-xc:fixnum
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (logand sb-xc:most-positive-fixnum
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (logxor bits
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (ash bits -7))))))))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (logxor bits (ash bits -7))))))))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (deftransform sxhash ((x) (single-float)) '#.+sxhash-single-float-expr+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #-64-bit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -216,7 +215,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (defun sxhash (x)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (let ((answer (etypecase x ; croak on anything but these
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (null (ash sb-vm:nil-value (- sb-vm:n-fixnum-tag-bits)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- (fixnum #.+sxhash-fixnum-expr+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ (sb-xc:fixnum #.+sxhash-fixnum-expr+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (single-float #.+sxhash-single-float-expr+)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (double-float #.+sxhash-double-float-expr+))))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ (push (cons x answer) *sxhash-crosscheck*)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/maxima/Portfile b/math/maxima/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 00f7777..d8e7484 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/maxima/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/maxima/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,7 +38,7 @@ subport maxima-devel {
</span> # Date: Fri Jun 15 17:26:53 2018 -0500
# commit 7e71fc4b6a95cab6418227754f01fc44ac845da1
version 5.41-dev-20180615
<span style='display:block; white-space:pre;background:#ffe0e0;'>- revision 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ revision 6
</span> fetch.type git
git.url https://git.code.sf.net/p/maxima/code
git.branch 7e71fc4b6a95cab6418227754f01fc44ac845da1
</pre><pre style='margin:0'>
</pre>