Update from 1.1.12 to 1.1.14. Aside from adjusting patches to build system changes, this is fairly routine update. Tests are clean on i386 and amd64 (aside from one which has never passed), and macppc is at least not worse than it was.
SBCL users (I know there's one or two of you out there!) please give this a spin. Note that you'll need -E when applying the patch. diff --git Makefile Makefile index 382896e..b17ca7d 100644 --- Makefile +++ Makefile @@ -5,7 +5,7 @@ ONLY_FOR_ARCHS = amd64 i386 powerpc COMMENT= compiler and runtime system for ANSI Common Lisp -V = 1.1.12 +V = 1.1.14 DISTNAME= sbcl-${V}-source PKGNAME= sbcl-${V} WRKDIST= ${WRKDIR}/sbcl-${V} @@ -37,14 +37,6 @@ BOOTSTRAP_CMD = ${LOCALBASE}/bin/clisp -q -norc .endif TEST_DEPENDS = devel/gmp -.for arch in amd64 i386 powerpc -. if ${MACHINE_ARCH} == ${arch} -PKG_ARGS += -D${arch}=1 -. else -PKG_ARGS += -D${arch}=0 -. endif -.endfor - USE_GMAKE= Yes PORTHOME= ${TMPDIR} MAKE_ENV= GNUMAKE=${GMAKE} INSTALL_ROOT=${PREFIX} \ @@ -67,8 +59,8 @@ pre-configure: mv ${VERSION_FILE}.new ${VERSION_FILE} do-build: - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} /bin/sh make.sh \ - --prefix=${PREFIX} --xc-host="${BOOTSTRAP_CMD}" + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} SBCL_CONTRIB_TARGET=all \ + /bin/sh make.sh --prefix=${PREFIX} --xc-host="${BOOTSTRAP_CMD}" cd ${WRKSRC}/doc/manual && touch sbcl.texinfo && \ ${SETENV} ${MAKE_ENV} ${GMAKE} asdf.info sbcl.info html @@ -79,7 +71,7 @@ post-install: chown -R 0:0 ${PREFIX}/lib/sbcl do-test: - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} RUN_CONTRIB_TESTS=1 \ + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} DONT_CLEAN_SBCL_CONTRIB=1 \ /bin/sh make-target-contrib.sh cd ${WRKSRC}/tests && ${SETENV} ${MAKE_ENV} /bin/sh run-tests.sh diff --git distinfo distinfo index b4900da..db52c83 100644 --- distinfo +++ distinfo @@ -1,2 +1,2 @@ -SHA256 (sbcl-1.1.12-source.tar.bz2) = jJQSy9tgG2Nv8+PHkIykbZ2X3P7ewz62NNsTEi81dFc= -SIZE (sbcl-1.1.12-source.tar.bz2) = 4217764 +SHA256 (sbcl-1.1.14-source.tar.bz2) = Zx5lo2HYNTE6ureUBMlU2lcDyO1c7qmC3efvTrDBGm8= +SIZE (sbcl-1.1.14-source.tar.bz2) = 4218825 diff --git patches/patch-contrib_asdf-module_mk patches/patch-contrib_asdf-module_mk deleted file mode 100644 index 878d8bd..0000000 --- patches/patch-contrib_asdf-module_mk +++ /dev/null @@ -1,26 +0,0 @@ -$OpenBSD: patch-contrib_asdf-module_mk,v 1.2 2013/09/15 16:34:00 jca Exp $ - -Fix 'all' target to allow building without running tests. - -Don't copy every single file when installing the contribs, only the -ones that are actually needed to load the system. - ---- contrib/asdf-module.mk.orig Sun Jun 2 15:12:39 2013 -+++ contrib/asdf-module.mk Sun Sep 15 14:11:33 2013 -@@ -27,7 +27,8 @@ endif - - export CC SBCL EXTRA_CFLAGS EXTRA_LDFLAGS - --all: $(EXTRA_ALL_TARGETS) -+all: $(EXTRA_ALL_TARGETS) $(SYSTEM).fasl -+$(SYSTEM).fasl: - $(MAKE) -C ../asdf - $(SBCL) --eval '(defvar *system* "$(SYSTEM)")' --load ../asdf-stub.lisp --eval '(exit)' - -@@ -40,5 +41,4 @@ test: all - # KLUDGE: There seems to be no portable way to tell tar to not to - # preserve owner, so chown after installing for the current user. - install: $(EXTRA_INSTALL_TARGETS) -- tar cf - . | ( cd "$(BUILD_ROOT)$(INSTALL_DIR)" && tar xpvf - ) -- find "$(BUILD_ROOT)$(INSTALL_DIR)" -exec chown `id -u`:`id -g` {} \; -+ cp -p $(SYSTEM).asd *.lisp *.fasl "$(BUILD_ROOT)$(INSTALL_DIR)" diff --git patches/patch-contrib_asdf_Makefile patches/patch-contrib_asdf_Makefile new file mode 100644 index 0000000..7513765 --- /dev/null +++ patches/patch-contrib_asdf_Makefile @@ -0,0 +1,12 @@ +$OpenBSD$ +--- contrib/asdf/Makefile.orig Sat Nov 30 06:28:17 2013 ++++ contrib/asdf/Makefile Sun Dec 8 18:46:33 2013 +@@ -1,6 +1,8 @@ + DEST=$(SBCL_PWD)/obj/sbcl-home/contrib/ + FASL=$(DEST)/asdf.fasl + ++all:: fasl ++ + fasl:: $(FASL) + $(FASL):: asdf.lisp ../../output/sbcl.core + if [ -d asdf-upstream ] ; then rm -rf asdf-upstream ; fi diff --git patches/patch-contrib_vanilla-module_mk patches/patch-contrib_vanilla-module_mk index f1b7a02..1b7270d 100644 --- patches/patch-contrib_vanilla-module_mk +++ patches/patch-contrib_vanilla-module_mk @@ -1,11 +1,12 @@ -$OpenBSD: patch-contrib_vanilla-module_mk,v 1.1 2011/07/08 11:42:09 jasper Exp $ - -Add an 'all' target to allow building without running tests. - ---- contrib/vanilla-module.mk.orig Mon May 9 04:49:39 2011 -+++ contrib/vanilla-module.mk Fri Jul 8 13:39:44 2011 -@@ -1,3 +1,4 @@ -+all: $(MODULE).fasl +$OpenBSD$ +--- contrib/vanilla-module.mk.orig Sat Nov 30 06:28:17 2013 ++++ contrib/vanilla-module.mk Sun Dec 8 18:42:59 2013 +@@ -2,6 +2,8 @@ DEST=$(SBCL_PWD)/obj/sbcl-home/contrib/ + FASL=$(DEST)/$(MODULE).fasl + ASD=$(DEST)/$(MODULE).asd - $(MODULE).fasl: $(MODULE).lisp ../../output/sbcl.core - $(SBCL) --eval '(compile-file (format nil "SYS:CONTRIB;~:@(~A~);~:@(~A~).LISP" "$(MODULE)" "$(MODULE)"))' </dev/null ++all:: $(FASL) $(ASD) ++ + fasl:: $(FASL) + $(FASL):: $(MODULE).lisp ../../output/sbcl.core + $(SBCL) --eval '(compile-file (format nil "SYS:CONTRIB;~:@(~A~);~:@(~A~).LISP" "$(MODULE)" "$(MODULE)") :output-file (parse-native-namestring "$@"))' </dev/null diff --git patches/patch-make-target-contrib_sh patches/patch-make-target-contrib_sh index e1e2680..33370d9 100644 --- patches/patch-make-target-contrib_sh +++ patches/patch-make-target-contrib_sh @@ -1,37 +1,17 @@ $OpenBSD: patch-make-target-contrib_sh,v 1.3 2013/09/15 16:34:00 jca Exp $ -Only run the contrib tests if $RUN_CONTRIB_TESTS is not empty. This -allows the contribs to be build when USE_SYSTRACE=Yes, and the tests -to be run later in do-regress. +Allow the makefile target to be overridden so that the contribs may be +built first (perhaps under USE_SYSTRACE=Yes) and the tests run later +in do-regress. ---- make-target-contrib.sh.orig Sun Jun 2 15:12:40 2013 -+++ make-target-contrib.sh Sun Sep 15 03:26:47 2013 -@@ -44,6 +44,7 @@ export SBCL SBCL_BUILDING_CONTRIB - # as SB-RT and SB-GROVEL, but FIXME: there's probably a better - # solution. -- CSR, 2003-05-30 - -+if [ -z "$RUN_CONTRIB_TESTS" ]; then - find contrib/ \( -name '*.fasl' -o \ - -name '*.FASL' -o \ - -name 'foo.c' -o \ -@@ -58,6 +59,11 @@ find contrib/ \( -name '*.fasl' -o \ - - find output -name 'building-contrib.*' -print | xargs rm -f - -+make_target=all -+else -+make_target=test -+fi -+ - # Ignore all source registries. - CL_SOURCE_REGISTRY='(:source-registry :ignore-inherited-configuration)' - export CL_SOURCE_REGISTRY -@@ -75,7 +81,7 @@ for i in $contribs_to_build; do - # export INSTALL_DIR=$SBCL_HOME/`basename $i ` - test -f $i/test-passed && rm $i/test-passed +--- make-target-contrib.sh.orig Sat Nov 30 06:28:18 2013 ++++ make-target-contrib.sh Sun Dec 8 18:03:12 2013 +@@ -73,7 +73,7 @@ for i in $contribs_to_build; do + test -f obj/asdf-cache/$i/test-passed.test-report && rm obj/asdf-cache/$i/test-passed.test-report + mkdir -p obj/asdf-cache/$i/ # hack to get exit codes right. -- if $GNUMAKE -C $i test 2>&1 && touch $i/test-passed ; then -+ if $GNUMAKE -C $i $make_target 2>&1 && touch $i/test-passed ; then +- if $GNUMAKE -C contrib/$i test < /dev/null 2>&1 && touch obj/asdf-cache/$i/test-passed.test-report ; then ++ if $GNUMAKE -C contrib/$i ${SBCL_CONTRIB_TARGET:-test} < /dev/null 2>&1 && touch obj/asdf-cache/$i/test-passed.test-report ; then : else exit $? diff --git pkg/PFRAG.amd64 pkg/PFRAG.amd64 deleted file mode 100644 index 95853d6..0000000 --- pkg/PFRAG.amd64 +++ /dev/null @@ -1,2 +0,0 @@ -@comment $OpenBSD: PFRAG.amd64,v 1.1 2010/08/24 12:20:43 jasper Exp $ -lib/sbcl/sb-rotate-byte/x86-64-vm.fasl diff --git pkg/PFRAG.i386 pkg/PFRAG.i386 deleted file mode 100644 index 2d9f9ad..0000000 --- pkg/PFRAG.i386 +++ /dev/null @@ -1,2 +0,0 @@ -@comment $OpenBSD: PFRAG.i386,v 1.1 2009/11/17 10:45:00 pirofti Exp $ -lib/sbcl/sb-rotate-byte/x86-vm.fasl diff --git pkg/PFRAG.powerpc pkg/PFRAG.powerpc deleted file mode 100644 index f670a6e..0000000 --- pkg/PFRAG.powerpc +++ /dev/null @@ -1,2 +0,0 @@ -@comment $OpenBSD: PFRAG.powerpc,v 1.1 2010/08/24 12:20:43 jasper Exp $ -lib/sbcl/sb-rotate-byte/ppc-vm.fasl diff --git pkg/PLIST pkg/PLIST index 55555e7..e5f8247 100644 --- pkg/PLIST +++ pkg/PLIST @@ -1,194 +1,42 @@ @comment $OpenBSD: PLIST,v 1.7 2013/10/22 19:44:16 jca Exp $ -%%amd64%% -%%i386%% -%%powerpc%% @bin bin/sbcl @info info/asdf.info @info info/sbcl.info lib/sbcl/ -lib/sbcl/asdf/ -lib/sbcl/asdf-install/ -lib/sbcl/asdf-install/asdf-install.asd -lib/sbcl/asdf-install/asdf-install.fasl -lib/sbcl/asdf-install/defpackage.fasl -lib/sbcl/asdf-install/defpackage.lisp -lib/sbcl/asdf-install/installer.fasl -lib/sbcl/asdf-install/installer.lisp -lib/sbcl/asdf/asdf.fasl -lib/sbcl/sb-aclrepl/ -lib/sbcl/sb-aclrepl/debug.fasl -lib/sbcl/sb-aclrepl/debug.lisp -lib/sbcl/sb-aclrepl/inspect.fasl -lib/sbcl/sb-aclrepl/inspect.lisp -lib/sbcl/sb-aclrepl/repl.fasl -lib/sbcl/sb-aclrepl/repl.lisp -lib/sbcl/sb-aclrepl/sb-aclrepl.asd -lib/sbcl/sb-aclrepl/sb-aclrepl.fasl -lib/sbcl/sb-aclrepl/tests.lisp -lib/sbcl/sb-aclrepl/toplevel.fasl -lib/sbcl/sb-aclrepl/toplevel.lisp -lib/sbcl/sb-bsd-sockets/ -lib/sbcl/sb-bsd-sockets/constants.fasl -lib/sbcl/sb-bsd-sockets/constants.lisp -lib/sbcl/sb-bsd-sockets/defpackage.fasl -lib/sbcl/sb-bsd-sockets/defpackage.lisp -lib/sbcl/sb-bsd-sockets/inet.fasl -lib/sbcl/sb-bsd-sockets/inet.lisp -lib/sbcl/sb-bsd-sockets/local.fasl -lib/sbcl/sb-bsd-sockets/local.lisp -lib/sbcl/sb-bsd-sockets/misc.fasl -lib/sbcl/sb-bsd-sockets/misc.lisp -lib/sbcl/sb-bsd-sockets/name-service.fasl -lib/sbcl/sb-bsd-sockets/name-service.lisp -lib/sbcl/sb-bsd-sockets/sb-bsd-sockets.asd -lib/sbcl/sb-bsd-sockets/sb-bsd-sockets.fasl -lib/sbcl/sb-bsd-sockets/sockets.fasl -lib/sbcl/sb-bsd-sockets/sockets.lisp -lib/sbcl/sb-bsd-sockets/sockopt.fasl -lib/sbcl/sb-bsd-sockets/sockopt.lisp -lib/sbcl/sb-bsd-sockets/split.fasl -lib/sbcl/sb-bsd-sockets/split.lisp -lib/sbcl/sb-bsd-sockets/tests.lisp -lib/sbcl/sb-bsd-sockets/win32-constants.lisp -lib/sbcl/sb-bsd-sockets/win32-lib.lisp -lib/sbcl/sb-bsd-sockets/win32-sockets.lisp -lib/sbcl/sb-cltl2/ -lib/sbcl/sb-cltl2/compiler-let.fasl -lib/sbcl/sb-cltl2/compiler-let.lisp -lib/sbcl/sb-cltl2/defpackage.fasl -lib/sbcl/sb-cltl2/defpackage.lisp -lib/sbcl/sb-cltl2/env.fasl -lib/sbcl/sb-cltl2/env.lisp -lib/sbcl/sb-cltl2/macroexpand.fasl -lib/sbcl/sb-cltl2/macroexpand.lisp -lib/sbcl/sb-cltl2/sb-cltl2.asd -lib/sbcl/sb-cltl2/sb-cltl2.fasl -lib/sbcl/sb-cltl2/tests.lisp -lib/sbcl/sb-concurrency/ -lib/sbcl/sb-concurrency/frlock.fasl -lib/sbcl/sb-concurrency/frlock.lisp -lib/sbcl/sb-concurrency/gate.fasl -lib/sbcl/sb-concurrency/gate.lisp -lib/sbcl/sb-concurrency/mailbox.fasl -lib/sbcl/sb-concurrency/mailbox.lisp -lib/sbcl/sb-concurrency/package.fasl -lib/sbcl/sb-concurrency/package.lisp -lib/sbcl/sb-concurrency/queue.fasl -lib/sbcl/sb-concurrency/queue.lisp -lib/sbcl/sb-concurrency/sb-concurrency.asd -lib/sbcl/sb-concurrency/sb-concurrency.fasl -lib/sbcl/sb-cover/ -lib/sbcl/sb-cover/cover.fasl -lib/sbcl/sb-cover/cover.lisp -lib/sbcl/sb-cover/sb-cover.asd -lib/sbcl/sb-cover/sb-cover.fasl -lib/sbcl/sb-cover/test-data-1.lisp -lib/sbcl/sb-cover/test-data-2.lisp -lib/sbcl/sb-cover/test-data-3.lisp -lib/sbcl/sb-cover/tests.lisp -lib/sbcl/sb-executable/ -lib/sbcl/sb-executable/sb-executable.fasl -lib/sbcl/sb-gmp/ -lib/sbcl/sb-gmp/gmp.fasl -lib/sbcl/sb-gmp/gmp.lisp -lib/sbcl/sb-gmp/sb-gmp.asd -lib/sbcl/sb-gmp/sb-gmp.fasl -lib/sbcl/sb-gmp/tests.lisp -lib/sbcl/sb-grovel/ -lib/sbcl/sb-grovel/def-to-lisp.fasl -lib/sbcl/sb-grovel/def-to-lisp.lisp -lib/sbcl/sb-grovel/defpackage.fasl -lib/sbcl/sb-grovel/defpackage.lisp -lib/sbcl/sb-grovel/example-constants.lisp -lib/sbcl/sb-grovel/foreign-glue.fasl -lib/sbcl/sb-grovel/foreign-glue.lisp -lib/sbcl/sb-grovel/sb-grovel.asd -lib/sbcl/sb-grovel/sb-grovel.fasl -lib/sbcl/sb-introspect/ -lib/sbcl/sb-introspect/introspect.fasl -lib/sbcl/sb-introspect/introspect.lisp -lib/sbcl/sb-introspect/load-test.lisp -lib/sbcl/sb-introspect/sb-introspect.asd -lib/sbcl/sb-introspect/sb-introspect.fasl -lib/sbcl/sb-introspect/test-driver.lisp -lib/sbcl/sb-introspect/test.lisp -lib/sbcl/sb-introspect/xref-test-data.lisp -lib/sbcl/sb-introspect/xref-test.lisp -lib/sbcl/sb-md5/ -lib/sbcl/sb-md5/md5-tests.lisp -lib/sbcl/sb-md5/md5.fasl -lib/sbcl/sb-md5/md5.lisp -lib/sbcl/sb-md5/sb-md5.asd -lib/sbcl/sb-md5/sb-md5.fasl -lib/sbcl/sb-posix/ -lib/sbcl/sb-posix/constants.fasl -lib/sbcl/sb-posix/constants.lisp -lib/sbcl/sb-posix/defpackage.fasl -lib/sbcl/sb-posix/defpackage.lisp -lib/sbcl/sb-posix/designator.fasl -lib/sbcl/sb-posix/designator.lisp -lib/sbcl/sb-posix/interface.fasl -lib/sbcl/sb-posix/interface.lisp -lib/sbcl/sb-posix/macros.fasl -lib/sbcl/sb-posix/macros.lisp -lib/sbcl/sb-posix/posix-tests.lisp -lib/sbcl/sb-posix/sb-posix.asd -lib/sbcl/sb-posix/sb-posix.fasl -lib/sbcl/sb-queue/ -lib/sbcl/sb-queue/package.fasl -lib/sbcl/sb-queue/package.lisp -lib/sbcl/sb-queue/sb-queue.asd -lib/sbcl/sb-queue/sb-queue.fasl -lib/sbcl/sb-rotate-byte/ -lib/sbcl/sb-rotate-byte/compiler.fasl -lib/sbcl/sb-rotate-byte/compiler.lisp -lib/sbcl/sb-rotate-byte/package.fasl -lib/sbcl/sb-rotate-byte/package.lisp -lib/sbcl/sb-rotate-byte/ppc-vm.lisp -lib/sbcl/sb-rotate-byte/rotate-byte-tests.lisp -lib/sbcl/sb-rotate-byte/rotate-byte.fasl -lib/sbcl/sb-rotate-byte/rotate-byte.lisp -lib/sbcl/sb-rotate-byte/sb-rotate-byte.asd -lib/sbcl/sb-rotate-byte/sb-rotate-byte.fasl -lib/sbcl/sb-rotate-byte/x86-64-vm.lisp -lib/sbcl/sb-rotate-byte/x86-vm.lisp -lib/sbcl/sb-rt/ -lib/sbcl/sb-rt/rt.fasl -lib/sbcl/sb-rt/rt.lisp -lib/sbcl/sb-rt/sb-rt.asd -lib/sbcl/sb-rt/sb-rt.fasl -lib/sbcl/sb-simple-streams/ -lib/sbcl/sb-simple-streams/classes.fasl -lib/sbcl/sb-simple-streams/classes.lisp -lib/sbcl/sb-simple-streams/direct.fasl -lib/sbcl/sb-simple-streams/direct.lisp -lib/sbcl/sb-simple-streams/file.fasl -lib/sbcl/sb-simple-streams/file.lisp -lib/sbcl/sb-simple-streams/fndb.fasl -lib/sbcl/sb-simple-streams/fndb.lisp -lib/sbcl/sb-simple-streams/impl.fasl -lib/sbcl/sb-simple-streams/impl.lisp -lib/sbcl/sb-simple-streams/internal.fasl -lib/sbcl/sb-simple-streams/internal.lisp -lib/sbcl/sb-simple-streams/iodefs.fasl -lib/sbcl/sb-simple-streams/iodefs.lisp -lib/sbcl/sb-simple-streams/null.fasl -lib/sbcl/sb-simple-streams/null.lisp -lib/sbcl/sb-simple-streams/package.fasl -lib/sbcl/sb-simple-streams/package.lisp -lib/sbcl/sb-simple-streams/sb-simple-streams.asd -lib/sbcl/sb-simple-streams/sb-simple-streams.fasl -lib/sbcl/sb-simple-streams/simple-stream-tests.lisp -lib/sbcl/sb-simple-streams/socket.fasl -lib/sbcl/sb-simple-streams/socket.lisp -lib/sbcl/sb-simple-streams/strategy.fasl -lib/sbcl/sb-simple-streams/strategy.lisp -lib/sbcl/sb-simple-streams/string.fasl -lib/sbcl/sb-simple-streams/string.lisp -lib/sbcl/sb-simple-streams/terminal.fasl -lib/sbcl/sb-simple-streams/terminal.lisp -lib/sbcl/sb-sprof/ -lib/sbcl/sb-sprof/sb-sprof.fasl +lib/sbcl/contrib/ +lib/sbcl/contrib/asdf.fasl +lib/sbcl/contrib/sb-aclrepl.asd +lib/sbcl/contrib/sb-aclrepl.fasl +lib/sbcl/contrib/sb-bsd-sockets.asd +lib/sbcl/contrib/sb-bsd-sockets.fasl +lib/sbcl/contrib/sb-cltl2.asd +lib/sbcl/contrib/sb-cltl2.fasl +lib/sbcl/contrib/sb-concurrency.asd +lib/sbcl/contrib/sb-concurrency.fasl +lib/sbcl/contrib/sb-cover.asd +lib/sbcl/contrib/sb-cover.fasl +lib/sbcl/contrib/sb-executable.asd +lib/sbcl/contrib/sb-executable.fasl +lib/sbcl/contrib/sb-gmp.asd +lib/sbcl/contrib/sb-gmp.fasl +lib/sbcl/contrib/sb-grovel.asd +lib/sbcl/contrib/sb-grovel.fasl +lib/sbcl/contrib/sb-introspect.asd +lib/sbcl/contrib/sb-introspect.fasl +lib/sbcl/contrib/sb-md5.asd +lib/sbcl/contrib/sb-md5.fasl +lib/sbcl/contrib/sb-posix.asd +lib/sbcl/contrib/sb-posix.fasl +lib/sbcl/contrib/sb-queue.asd +lib/sbcl/contrib/sb-queue.fasl +lib/sbcl/contrib/sb-rotate-byte.asd +lib/sbcl/contrib/sb-rotate-byte.fasl +lib/sbcl/contrib/sb-rt.asd +lib/sbcl/contrib/sb-rt.fasl +lib/sbcl/contrib/sb-simple-streams.asd +lib/sbcl/contrib/sb-simple-streams.fasl +lib/sbcl/contrib/sb-sprof.asd +lib/sbcl/contrib/sb-sprof.fasl lib/sbcl/sbcl.core lib/sbcl/site-systems/ @man man/man1/sbcl.1