I didn't make in time for 7.1 so I've waited a bit for the new version.
A couple of days ago, sbcl 2.2.4 was released, and here's the updated
diff ;)

recap of the previous episodes: gkoehler@ (thanks!) spotted some
failures when building sbcl with capstone installed: there were some
issue in the sb-capstone module on !amd64.  These issue were fixed (with
help from gkoehler) and sent upstream (included in 2.2.3).  While here
I've also re-established the build on i386 (using ecl instead of clisp
for the boostrap.)  Joshua hinted that by using lang/ecl for the
bootstrap it may be possible to build sbcl on other arches too.

I got a few OKs for the previous diffs but since this is a newer version
I'm doing another round.

Index: Makefile
===================================================================
RCS file: /home/cvs/ports/lang/sbcl/Makefile,v
retrieving revision 1.48
diff -u -p -r1.48 Makefile
--- Makefile    11 Mar 2022 19:29:14 -0000      1.48
+++ Makefile    2 May 2022 08:50:46 -0000
@@ -1,33 +1,15 @@
-BROKEN-i386 =          build fails in "Compiling file 
[...]/src/compiler/generic/genesis.lisp"
-# ;; Compiling file 
/pobj/sbcl-2.0.1/sbcl-2.0.1/src/compiler/generic/genesis.lisp ...
-# ;; Wrote file 
/pobj/sbcl-2.0.1/sbcl-2.0.1/obj/from-host/src/compiler/generic/genesis.fas-tmp
-# 0 errors, 0 warnings
-# ;;  Loading file obj/from-host/src/compiler/generic/genesis.fas ...
-# ;;  Loaded file obj/from-host/src/compiler/generic/genesis.fas
-# *** - OPEN: File
-#       #P"/pobj/sbcl-2.0.1/sbcl-2.0.1/obj/from-xc/tls-init.lisp-expr" does not
-#       exist
-# The following restarts are available:
-# SKIP           :R1      skip (GENESIS OBJECT-FILE-NAMES # ...)
-# RETRY          :R2      retry (GENESIS OBJECT-FILE-NAMES # ...)
-# STOP           :R3      stop loading file 
/pobj/sbcl-2.0.1/sbcl-2.0.1/make-genesis-2.lisp
-# ABORT-BUILD    :R4      Abort building SBCL.
-# ABORT          :R5      Abort main loop
-# //testing for consistency of first and second GENESIS passes
-# diff: output/genesis-2: No such file or directory   
-# error: header files do not match between first and second GENESIS
-
 # not yet ported to other arches
 ONLY_FOR_ARCHS =       amd64 i386 powerpc
 USE_WXNEEDED =         Yes
 
 COMMENT=               compiler and runtime system for ANSI Common Lisp
 
-V =                    2.1.11
+V =                    2.2.4
 DISTNAME=              sbcl-${V}-source
 PKGNAME=               sbcl-${V}
 WRKDIST=               ${WRKDIR}/sbcl-${V}
 EXTRACT_SUFX=          .tar.bz2
+PATCHORIG =            .orig.port
 
 CATEGORIES=            lang
 HOMEPAGE=              http://www.sbcl.org/
@@ -56,10 +38,17 @@ WANTLIB+=           pthread
 MAKE_PARAMS +=         --with-sb-core-compression \
                        --with-sb-xref-for-internals
 
+# contrib/sb-capstone/test.lisp uses it at build-time if present
+BUILD_DEPENDS =                devel/capstone/main
+
 .if ${FLAVOR:Mnative_bootstrap}
 BUILD_DEPENDS+=                lang/sbcl
 BOOTSTRAP_CMD=         ${LOCALBASE}/bin/sbcl \
                        --disable-debugger --no-sysinit --no-userinit
+.elif ${MACHINE_ARCH:Mi386}
+# ecl is slower but lang/clisp fails to build sbcl on i386
+BUILD_DEPENDS +=       lang/ecl
+BOOTSTRAP_CMD =                ${LOCALBASE}/bin/ecl -q --norc
 .else
 BUILD_DEPENDS +=       lang/clisp
 BOOTSTRAP_CMD =                ${LOCALBASE}/bin/clisp -q -norc
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/lang/sbcl/distinfo,v
retrieving revision 1.21
diff -u -p -r1.21 distinfo
--- distinfo    31 Dec 2021 09:53:11 -0000      1.21
+++ distinfo    2 May 2022 08:50:57 -0000
@@ -1,2 +1,2 @@
-SHA256 (sbcl-2.1.11-source.tar.bz2) = 
v8FIHef9vfru8qsPDo6E79NDQz3qjSHPvqiwFGy9/v0=
-SIZE (sbcl-2.1.11-source.tar.bz2) = 6687529
+SHA256 (sbcl-2.2.4-source.tar.bz2) = 
/N0lHLxl9/gI7QrXckaEjRvhZqppoX90mWABhLelcgI=
+SIZE (sbcl-2.2.4-source.tar.bz2) = 7030086

Reply via email to