Thursday, March 31, 2022

Re: update lang/sbcl to 2.2.1

I'd really, really like to get an updated sbcl in 7.1, so I'll commit
the attached diff in a couple of days if I don't hear complaints.

I've updated to sbcl 2.2.3 (released some days ago) which includes the
diff for sb-capstone. Both flavors builds fine on amd64 and x11/stumpwm
builds too. I've tested with some stuff from quicklisp and works too.

I'm currently doing some builds on i386. I've got one failure but that
was because I had another (wip) version of sbcl installed during the
build; I'm now rebuilding both flavors there a couple of times to be
sure and try x11/stumpwm there too.

Thanks to everyone who tested the previous iterations of the diff! :)

Omar Polo <op@openbsd.org> wrote:
> friendly weekly ping
>
> (while here also dropped the last rcs id in patches)
>
> Omar Polo <op@openbsd.org> wrote:
> > Joshua Elsasser <josh@elsasser.org> wrote:
> > > I will try to find some time to take a look at it this week. For what
> > > it's worth, 32-bit powerpc is usually a bit broken on non-openbsd
> > > platforms as well. I have a couple g4 mac minis that I can test on,
> > > assuming they haven't died.
> >
> > thanks for looking into this :)
> >
> > in the meantime sbcl 2.2.2 was released, please find attached an updated
> > diff. The capstone fix didn't make in time for 2.2.2 but should be
> > available in a next version.
> >
> > > Switching to ECL as the cross-build host is something what we probably
> > > want to do, as it would also allow sbcl to be build on arm and
> > > arm64. I had a version of the port which did this but as you saw, it
> > > was rather slower than with clisp.
> >
> > (I don't have any arm or arm64 hw to help with that unfortunately)
> >
> > I think we could keep clisp on powerpc and amd64 and use ecl for other
> > arches eventually, or do you prefer to always use the same CL
> > implementation on all architecture to build sbcl?
> >
> > (I've also removed the RCS id from the makefile and plist as per recent
> > developments since I was here)
> >
> > Cheers,
> >
> > Omar Polo

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 29 Mar 2022 06:52:54 -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.3
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 29 Mar 2022 06:54:22 -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.3-source.tar.bz2) = 3n9J4fd1D9LNiREe9wZBzFRxNV9iG3NzkqxoqpXzf58=
+SIZE (sbcl-2.2.3-source.tar.bz2) = 6715725

No comments:

Post a Comment