sbcl: update to 2.2.7.

This commit is contained in:
Leah Neukirchen 2022-07-30 19:34:08 +02:00
parent 471d66133e
commit b3d975758d
2 changed files with 3 additions and 80 deletions

View File

@ -1,77 +0,0 @@
From 900eff6ae477b2674b8504d5420d565ca09ac813 Mon Sep 17 00:00:00 2001
From: Robert Schiele <rschiele@gmail.com>
Date: Fri, 24 Jun 2022 16:50:54 +0200
Subject: [PATCH] take contrib blocklist into account for doc generation
If some contrib module is blocked for building also block it in
documentation generation since this will fail otherwise.
Additionally this fixes a shift operation that is needed
unconditionally when parsing the script parameters since otherwise
the first parameter is used for the second parameter as well if it
turns out to be empty.
---
doc/manual/generate-texinfo.lisp | 9 +++++----
doc/manual/make-tempfiles.sh | 8 +++++---
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/doc/manual/generate-texinfo.lisp b/doc/manual/generate-texinfo.lisp
index 83451754d..44e5edca8 100644
--- a/doc/manual/generate-texinfo.lisp
+++ b/doc/manual/generate-texinfo.lisp
@@ -32,8 +32,9 @@
finally (return result)))
(defun generate-docstrings-texinfo (runtime
- &key (docstring-directory "docstrings/"))
- (let* ((contribs (sort (documented-contribs) #'string< :key #'car))
+ &key (docstring-directory "docstrings/")
+ (blocklist '()))
+ (let* ((contribs (sort (documented-contribs :exclude (append '("asdf") blocklist)) #'string< :key #'car))
(packages (sort (append *documented-packages*
(map 'list #'cdr contribs))
#'string<)))
@@ -92,10 +93,10 @@
;;;; Entry point
-(destructuring-bind (program runtime docstring-directory) *posix-argv*
+(destructuring-bind (program runtime docstring-directory blocklist) *posix-argv*
(declare (ignore program))
(generate-docstrings-texinfo
- runtime :docstring-directory docstring-directory)
+ runtime :docstring-directory docstring-directory :blocklist (uiop:split-string blocklist))
(expand-variables)
(generate-external-format-texinfo))
diff --git a/doc/manual/make-tempfiles.sh b/doc/manual/make-tempfiles.sh
index bf36ab1ec..faf1bbbf9 100644
--- a/doc/manual/make-tempfiles.sh
+++ b/doc/manual/make-tempfiles.sh
@@ -26,18 +26,20 @@ if [ -z "$1" ] ; then
else
SBCLRUNTIME="`command -v sbcl`"
fi
+ . $SBCL_TOP/output/build-config
else
SBCLRUNTIME="$1"
- shift
+ SBCL_CONTRIB_BLOCKLIST=
fi
+shift
if [ -z "$1" ] ; then
DOCSTRINGDIR="${DOCSTRINGDIR:-docstrings/}"
else
DOCSTRINGDIR="$1"
- shift
fi
+shift
${SBCLRUNTIME} \
--noinform --no-sysinit --no-userinit --noprint --disable-debugger \
- --script generate-texinfo.lisp "${SBCLRUNTIME}" "${DOCSTRINGDIR}"
+ --script generate-texinfo.lisp "${SBCLRUNTIME}" "${DOCSTRINGDIR}" "${SBCL_CONTRIB_BLOCKLIST}"
--
2.36.1

View File

@ -1,6 +1,6 @@
# Template file for 'sbcl'
pkgname=sbcl
version=2.2.6
version=2.2.7
revision=1
# make sure the sbcl option in maxima is enabled for the same archs
archs="i686 x86_64* armv7l aarch64 ppc64le*"
@ -13,7 +13,7 @@ license="custom:BSD+public_domain"
homepage="http://www.sbcl.org/"
changelog="http://www.sbcl.org/news.html"
distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-source.tar.bz2"
checksum=3e23048c8fa826fb913220beb2ac3697dbc5c0cdf2e89fed8db39ed1712304a0
checksum=ec98996fdaa68009d98b4d7db2189271f2ad455ec322ca95a9c6aebf08bead6d
nocross=yes
nopie=yes
@ -21,7 +21,7 @@ _bootstrap_lisp="bash ../sbcl-*-linux/run-sbcl.sh --no-sysinit --no-userinit --d
case "$XBPS_TARGET_MACHINE" in
x86_64)
distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-${version}-x86-64-linux-binary.tar.bz2"
checksum+=" 9fd7132a10270a4929fcd07291c8fe66bdb51cf0f024f0cbec7fc02eb9595996"
checksum+=" 4b176dd651437af851f6eb8332b51457f983079d27d347c30c73b3481959be78"
;;
arm*)
distfiles+=" ${SOURCEFORGE_SITE}/${pkgname}/${pkgname}-1.2.14-armhf-linux-binary.tar.bz2"